You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2008/11/04 22:58:55 UTC
svn commit: r711435 - in /myfaces/extensions/validator/trunk:
core/src/main/java/org/apache/myfaces/extensions/validator/core/el/
core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/
core/src/main/java/org/apache/myfaces/extensi...
Author: gpetracek
Date: Tue Nov 4 13:58:53 2008
New Revision: 711435
URL: http://svn.apache.org/viewvc?rev=711435&view=rev
Log:
changed names
Added:
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/DefaultPropertyInformation.java
- copied, changed from r709546, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/DefaultSourceInformation.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyDetails.java
- copied, changed from r711295, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/TargetInformationEntry.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyInformation.java
- copied, changed from r709546, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/SourceInformation.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyInformationKeys.java
- copied, changed from r711295, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/PropertySourceInformationKeys.java
Removed:
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/TargetInformationEntry.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/DefaultSourceInformation.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/PropertySourceInformationKeys.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/SourceInformation.java
Modified:
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ELHelper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractor.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/MetaDataExtractor.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/ValidationInterceptorWithSkipValidationSupport.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningMetaDataExtractor.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/SkipValidationStrategy.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/recorder/CrossValidationUserInputRecorder.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/LocalCompareStrategy.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/LocalPropertyChainCompareStrategy.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelper.java?rev=711435&r1=711434&r2=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelper.java Tue Nov 4 13:58:53 2008
@@ -24,6 +24,7 @@
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
+import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -167,7 +168,7 @@
return new ValueBindingExpression(valueBindingExpression);
}
- public TargetInformationEntry getTargetInformation(UIComponent uiComponent)
+ public PropertyDetails getTargetInformation(UIComponent uiComponent)
{
if("true".equalsIgnoreCase(ACTIVATE_EL_RESOLVER))
{
@@ -195,7 +196,7 @@
if(elResolver.getPath() != null && elResolver.getBaseObject() != null && elResolver.getProperty() != null)
{
- return new TargetInformationEntry(
+ return new PropertyDetails(
elResolver.getPath(), elResolver.getBaseObject(), elResolver.getProperty());
}
}
@@ -227,7 +228,7 @@
path = currentValueBindingExpression.getProperty() + "." + path;
- return new TargetInformationEntry(path,
+ return new PropertyDetails(path,
getBaseObject(valueBindingExpression), valueBindingExpression.getProperty());
}
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ELHelper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ELHelper.java?rev=711435&r1=711434&r2=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ELHelper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ELHelper.java Tue Nov 4 13:58:53 2008
@@ -20,6 +20,7 @@
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -45,7 +46,7 @@
Object getValueOfExpression(FacesContext facesContext, ValueBindingExpression valueBindingExpression);
- TargetInformationEntry getTargetInformation(UIComponent uiComponent);
+ PropertyDetails getTargetInformation(UIComponent uiComponent);
boolean isExpressionValid(FacesContext facesContext, String valueBindingExpression);
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java?rev=711435&r1=711434&r2=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java Tue Nov 4 13:58:53 2008
@@ -25,7 +25,7 @@
import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.core.metadata.CommonMetaDataKeys;
-import org.apache.myfaces.extensions.validator.core.metadata.PropertySourceInformationKeys;
+import org.apache.myfaces.extensions.validator.core.property.PropertyInformationKeys;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.recorder.ProcessedInformationRecorder;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
@@ -101,7 +101,7 @@
}
}
- if(Boolean.TRUE.equals(entry.getProperty(PropertySourceInformationKeys.SKIP_VALIDATION, Boolean.class)))
+ if(Boolean.TRUE.equals(entry.getProperty(PropertyInformationKeys.SKIP_VALIDATION, Boolean.class)))
{
metaData.put(CommonMetaDataKeys.SKIP_VALIDATION, true);
}
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractor.java?rev=711435&r1=711434&r2=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractor.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractor.java Tue Nov 4 13:58:53 2008
@@ -18,11 +18,11 @@
*/
package org.apache.myfaces.extensions.validator.core.metadata.extractor;
-import org.apache.myfaces.extensions.validator.core.el.TargetInformationEntry;
-import org.apache.myfaces.extensions.validator.core.metadata.SourceInformation;
-import org.apache.myfaces.extensions.validator.core.metadata.DefaultSourceInformation;
+import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
+import org.apache.myfaces.extensions.validator.core.property.PropertyInformation;
+import org.apache.myfaces.extensions.validator.core.property.DefaultPropertyInformation;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
-import org.apache.myfaces.extensions.validator.core.metadata.PropertySourceInformationKeys;
+import org.apache.myfaces.extensions.validator.core.property.PropertyInformationKeys;
import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.Priority;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -61,14 +61,14 @@
}
@ToDo(Priority.MEDIUM)
- public SourceInformation extract(FacesContext facesContext, Object object)
+ public PropertyInformation extract(FacesContext facesContext, Object object)
{
- SourceInformation sourceInformation = new DefaultSourceInformation();
+ PropertyInformation propertyInformation = new DefaultPropertyInformation();
//should never occur
if (!(object instanceof UIComponent))
{
- return sourceInformation;
+ return propertyInformation;
}
UIComponent uiComponent = (UIComponent) object;
@@ -78,21 +78,21 @@
logger.trace("start extracting meta-data of " + uiComponent.getClass().getName());
}
- TargetInformationEntry targetInformationEntry =
+ PropertyDetails propertyDetails =
ExtValUtils.getELHelper().getTargetInformation(uiComponent);
- if (targetInformationEntry == null)
+ if (propertyDetails == null)
{
- return sourceInformation;
+ return propertyInformation;
}
/*
* get bean class and property name
*/
- Class entityClass = targetInformationEntry.getBaseObject().getClass();
+ Class entityClass = propertyDetails.getBaseObject().getClass();
//create
- sourceInformation.setProperty(PropertySourceInformationKeys.TARGET_INFORMATION_ENTRY, targetInformationEntry);
+ propertyInformation.setInformation(PropertyInformationKeys.PROPERTY_DETAILS, propertyDetails);
/*
* find and add annotations
@@ -101,8 +101,8 @@
while (!Object.class.getName().equals(currentClass.getName()))
{
- addPropertyAccessAnnotations(currentClass, targetInformationEntry.getProperty(), sourceInformation);
- addFieldAccessAnnotations(currentClass, targetInformationEntry.getProperty(), sourceInformation);
+ addPropertyAccessAnnotations(currentClass, propertyDetails.getProperty(), propertyInformation);
+ addFieldAccessAnnotations(currentClass, propertyDetails.getProperty(), propertyInformation);
currentClass = currentClass.getSuperclass();
}
@@ -113,7 +113,7 @@
while (currentClass != null)
{
- addPropertyAccessAnnotations(currentClass, targetInformationEntry.getProperty(), sourceInformation);
+ addPropertyAccessAnnotations(currentClass, propertyDetails.getProperty(), propertyInformation);
currentClass = currentClass.getSuperclass();
}
@@ -124,11 +124,11 @@
logger.trace("extract finished");
}
- return sourceInformation;
+ return propertyInformation;
}
protected void addPropertyAccessAnnotations(Class entity, String property,
- SourceInformation sourceInformation)
+ PropertyInformation propertyInformation)
{
property = property.substring(0, 1).toUpperCase() + property.substring(1);
@@ -156,11 +156,11 @@
}
}
- addAnnotationToAnnotationEntries(Arrays.asList(method.getAnnotations()), sourceInformation);
+ addAnnotationToAnnotationEntries(Arrays.asList(method.getAnnotations()), propertyInformation);
}
protected void addFieldAccessAnnotations(Class entity, String property,
- SourceInformation sourceInformation)
+ PropertyInformation propertyInformation)
{
Field field;
@@ -185,15 +185,15 @@
}
}
- addAnnotationToAnnotationEntries(Arrays.asList(field.getAnnotations()), sourceInformation);
+ addAnnotationToAnnotationEntries(Arrays.asList(field.getAnnotations()), propertyInformation);
}
protected void addAnnotationToAnnotationEntries(
- List<Annotation> annotations, SourceInformation sourceInformation)
+ List<Annotation> annotations, PropertyInformation propertyInformation)
{
for (Annotation annotation : annotations)
{
- sourceInformation.addMetaDataEntry(createMetaDataEntryForAnnotation(annotation));
+ propertyInformation.addMetaDataEntry(createMetaDataEntryForAnnotation(annotation));
if(logger.isTraceEnabled())
{
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/MetaDataExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/MetaDataExtractor.java?rev=711435&r1=711434&r2=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/MetaDataExtractor.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/MetaDataExtractor.java Tue Nov 4 13:58:53 2008
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.extensions.validator.core.metadata.extractor;
-import org.apache.myfaces.extensions.validator.core.metadata.SourceInformation;
+import org.apache.myfaces.extensions.validator.core.property.PropertyInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -34,5 +34,5 @@
@UsageInformation(UsageCategory.API)
public interface MetaDataExtractor
{
- SourceInformation extract(FacesContext facesContext, Object object);
+ PropertyInformation extract(FacesContext facesContext, Object object);
}
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/DefaultPropertyInformation.java (from r709546, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/DefaultSourceInformation.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/DefaultPropertyInformation.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/DefaultPropertyInformation.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/DefaultSourceInformation.java&r1=709546&r2=711435&rev=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/DefaultSourceInformation.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/DefaultPropertyInformation.java Tue Nov 4 13:58:53 2008
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.metadata;
+package org.apache.myfaces.extensions.validator.core.property;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import java.util.HashMap;
import java.util.List;
@@ -31,29 +32,29 @@
* @since 1.x.1
*/
@UsageInformation(UsageCategory.INTERNAL)
-public class DefaultSourceInformation implements SourceInformation
+public class DefaultPropertyInformation implements PropertyInformation
{
- private Map<String, Object> properties = new HashMap<String, Object>();
+ private Map<String, Object> informationMap = new HashMap<String, Object>();
private List<MetaDataEntry> metaDataList = new ArrayList<MetaDataEntry>();
- public boolean containsProperty(String key)
+ public boolean containsInformation(String key)
{
- return properties.containsKey(key);
+ return informationMap.containsKey(key);
}
- public Object getProperty(String key)
+ public Object getInformation(String key)
{
- return properties.get(key);
+ return informationMap.get(key);
}
- public <T> T getProperty(String key, Class<T> targetClass)
+ public <T> T getInformation(String key, Class<T> targetClass)
{
- return (T)getProperty(key);
+ return (T) getInformation(key);
}
- public void setProperty(String key, Object value)
+ public void setInformation(String key, Object value)
{
- properties.put(key, value);
+ informationMap.put(key, value);
}
public MetaDataEntry[] getMetaDataEntries()
@@ -63,7 +64,7 @@
public void addMetaDataEntry(MetaDataEntry metaDataEntry)
{
- metaDataEntry.setProperties(this.properties);
+ metaDataEntry.setProperties(this.informationMap);
this.metaDataList.add(metaDataEntry);
}
}
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyDetails.java (from r711295, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/TargetInformationEntry.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyDetails.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyDetails.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/TargetInformationEntry.java&r1=711295&r2=711435&rev=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/TargetInformationEntry.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyDetails.java Tue Nov 4 13:58:53 2008
@@ -16,20 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.el;
+package org.apache.myfaces.extensions.validator.core.property;
/**
* @author Gerhard Petracek
* @since 1.x.1
*/
-public class TargetInformationEntry
+public class PropertyDetails
{
//forms the id for cross-validation within complex components
private String key;
private Object baseObject;
private String property;
- public TargetInformationEntry(String key, Object baseObject, String property)
+ public PropertyDetails(String key, Object baseObject, String property)
{
this.key = key;
this.baseObject = baseObject;
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyInformation.java (from r709546, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/SourceInformation.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyInformation.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyInformation.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/SourceInformation.java&r1=709546&r2=711435&rev=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/SourceInformation.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyInformation.java Tue Nov 4 13:58:53 2008
@@ -16,22 +16,23 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.metadata;
+package org.apache.myfaces.extensions.validator.core.property;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
/**
* @author Gerhard Petracek
* @since 1.x.1
*/
@UsageInformation(UsageCategory.API)
-public interface SourceInformation
+public interface PropertyInformation
{
- boolean containsProperty(String key);
- Object getProperty(String key);
- <T> T getProperty(String key, Class<T> targetClass);
- void setProperty(String key, Object value);
+ boolean containsInformation(String key);
+ Object getInformation(String key);
+ <T> T getInformation(String key, Class<T> targetClass);
+ void setInformation(String key, Object value);
MetaDataEntry[] getMetaDataEntries();
void addMetaDataEntry(MetaDataEntry metaDataEntry);
Copied: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyInformationKeys.java (from r711295, myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/PropertySourceInformationKeys.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyInformationKeys.java?p2=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyInformationKeys.java&p1=myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/PropertySourceInformationKeys.java&r1=711295&r2=711435&rev=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/PropertySourceInformationKeys.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyInformationKeys.java Tue Nov 4 13:58:53 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.validator.core.metadata;
+package org.apache.myfaces.extensions.validator.core.property;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -26,8 +26,8 @@
* @since 1.x.1
*/
@UsageInformation(UsageCategory.INTERNAL)
-public interface PropertySourceInformationKeys
+public interface PropertyInformationKeys
{
- static final String TARGET_INFORMATION_ENTRY = "target_information_entry";
+ static final String PROPERTY_DETAILS = "property_details";
static final String SKIP_VALIDATION = "skip_validation";
}
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java?rev=711435&r1=711434&r2=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java Tue Nov 4 13:58:53 2008
@@ -24,16 +24,16 @@
import org.apache.myfaces.extensions.validator.core.validation.message.resolver.MessageResolver;
import org.apache.myfaces.extensions.validator.core.mapper.ClassMappingFactory;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.property.PropertyInformationKeys;
+import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
import org.apache.myfaces.extensions.validator.core.el.ELHelper;
import org.apache.myfaces.extensions.validator.core.el.AbstractELHelperFactory;
-import org.apache.myfaces.extensions.validator.core.el.TargetInformationEntry;
import org.apache.myfaces.extensions.validator.core.el.ValueBindingExpression;
import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractorFactory;
import org.apache.myfaces.extensions.validator.core.initializer.component.ComponentInitializer;
import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
-import org.apache.myfaces.extensions.validator.core.metadata.PropertySourceInformationKeys;
import org.apache.myfaces.extensions.validator.core.factory.FactoryNames;
import javax.faces.component.UIComponent;
@@ -95,7 +95,7 @@
.getFactory(FactoryNames.EL_HELPER_FACTORY, AbstractELHelperFactory.class).create();
}
- public static TargetInformationEntry createTargetInformationEntryForNewTarget(MetaDataEntry metaDataEntry,
+ public static PropertyDetails createTargetInformationEntryForNewTarget(MetaDataEntry metaDataEntry,
String targetExpression)
{
Object baseObject;
@@ -105,18 +105,18 @@
String expression = vbe.getExpressionString();
baseObject = ExtValUtils.getELHelper().getBaseObject(vbe);
- return new TargetInformationEntry(
+ return new PropertyDetails(
expression.substring(2, expression.length() - 1), baseObject, vbe.getProperty());
}
- TargetInformationEntry original = metaDataEntry.getProperty(
- PropertySourceInformationKeys.TARGET_INFORMATION_ENTRY, TargetInformationEntry.class);
+ PropertyDetails original = metaDataEntry.getProperty(
+ PropertyInformationKeys.PROPERTY_DETAILS, PropertyDetails.class);
String newBaseKey = original.getKey().substring(0, original.getKey().lastIndexOf(".") + 1);
String newKey = newBaseKey + targetExpression;
baseObject = ReflectionUtils.getBaseOfPropertyChain(original.getBaseObject(), targetExpression);
- return new TargetInformationEntry(
+ return new PropertyDetails(
newKey, baseObject, targetExpression.substring(targetExpression.lastIndexOf(".") + 1,
targetExpression.length()));
}
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/ValidationInterceptorWithSkipValidationSupport.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/ValidationInterceptorWithSkipValidationSupport.java?rev=711435&r1=711434&r2=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/ValidationInterceptorWithSkipValidationSupport.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/ValidationInterceptorWithSkipValidationSupport.java Tue Nov 4 13:58:53 2008
@@ -22,7 +22,7 @@
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
-import org.apache.myfaces.extensions.validator.core.metadata.PropertySourceInformationKeys;
+import org.apache.myfaces.extensions.validator.core.property.PropertyInformationKeys;
import org.apache.myfaces.extensions.validator.core.interceptor.ValidationInterceptor;
import org.apache.myfaces.extensions.validator.baseval.annotation.SkipValidationSupport;
import org.apache.myfaces.extensions.validator.baseval.strategy.SkipValidationStrategy;
@@ -46,7 +46,7 @@
if(validationStrategy.getClass().isAnnotationPresent(SkipValidationSupport.class))
{
Boolean skipValidation = metaDataEntry.getProperty(
- PropertySourceInformationKeys.SKIP_VALIDATION, Boolean.class);
+ PropertyInformationKeys.SKIP_VALIDATION, Boolean.class);
if(Boolean.TRUE.equals(skipValidation))
{
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningMetaDataExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningMetaDataExtractor.java?rev=711435&r1=711434&r2=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningMetaDataExtractor.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/annotation/extractor/DefaultPropertyScanningMetaDataExtractor.java Tue Nov 4 13:58:53 2008
@@ -18,11 +18,11 @@
*/
package org.apache.myfaces.extensions.validator.baseval.annotation.extractor;
-import org.apache.myfaces.extensions.validator.core.metadata.SourceInformation;
-import org.apache.myfaces.extensions.validator.core.metadata.DefaultSourceInformation;
-import org.apache.myfaces.extensions.validator.core.metadata.PropertySourceInformationKeys;
+import org.apache.myfaces.extensions.validator.core.property.PropertyInformation;
+import org.apache.myfaces.extensions.validator.core.property.PropertyInformationKeys;
+import org.apache.myfaces.extensions.validator.core.property.DefaultPropertyInformation;
+import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
import org.apache.myfaces.extensions.validator.core.metadata.extractor.DefaultComponentMetaDataExtractor;
-import org.apache.myfaces.extensions.validator.core.el.TargetInformationEntry;
import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.Priority;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -39,29 +39,29 @@
{
@Override
@ToDo(Priority.MEDIUM)
- public SourceInformation extract(FacesContext facesContext, Object object)
+ public PropertyInformation extract(FacesContext facesContext, Object object)
{
- SourceInformation sourceInformation = new DefaultSourceInformation();
+ PropertyInformation propertyInformation = new DefaultPropertyInformation();
- if (!(object instanceof TargetInformationEntry))
+ if (!(object instanceof PropertyDetails))
{
- throw new IllegalStateException(object.getClass() + " is not a " + TargetInformationEntry.class.getName());
+ throw new IllegalStateException(object.getClass() + " is not a " + PropertyDetails.class.getName());
}
- TargetInformationEntry targetInformationEntry = (TargetInformationEntry)object;
+ PropertyDetails propertyDetails = (PropertyDetails)object;
- Class entityClass = targetInformationEntry.getBaseObject().getClass();
+ Class entityClass = propertyDetails.getBaseObject().getClass();
//TODO test with complex components
- sourceInformation.setProperty(
- PropertySourceInformationKeys.TARGET_INFORMATION_ENTRY, targetInformationEntry);
+ propertyInformation.setInformation(
+ PropertyInformationKeys.PROPERTY_DETAILS, propertyDetails);
/*
* find and add annotations
*/
- addPropertyAccessAnnotations(entityClass, targetInformationEntry.getProperty(), sourceInformation);
- addFieldAccessAnnotations(entityClass, targetInformationEntry.getProperty(), sourceInformation);
+ addPropertyAccessAnnotations(entityClass, propertyDetails.getProperty(), propertyInformation);
+ addFieldAccessAnnotations(entityClass, propertyDetails.getProperty(), propertyInformation);
- return sourceInformation;
+ return propertyInformation;
}
}
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java?rev=711435&r1=711434&r2=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java Tue Nov 4 13:58:53 2008
@@ -24,7 +24,7 @@
import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.core.el.TargetInformationEntry;
+import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -51,14 +51,14 @@
Map<String, Object> results = new HashMap<String, Object>();
- TargetInformationEntry targetInformationEntry;
+ PropertyDetails propertyDetails;
for (String targetExpression : targetExpressions)
{
- targetInformationEntry = ExtValUtils
+ propertyDetails = ExtValUtils
.createTargetInformationEntryForNewTarget(metaDataEntry, targetExpression);
for (MetaDataEntry entry : extractor.extract(FacesContext.getCurrentInstance(),
- targetInformationEntry).getMetaDataEntries())
+ propertyDetails).getMetaDataEntries())
{
validationStrategy = ExtValUtils.getValidationStrategyForMetaData(entry.getKey());
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java?rev=711435&r1=711434&r2=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java Tue Nov 4 13:58:53 2008
@@ -24,7 +24,7 @@
import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
import org.apache.myfaces.extensions.validator.core.validation.strategy.AbstractValidatorAdapter;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.core.el.TargetInformationEntry;
+import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -50,13 +50,13 @@
ValidationStrategy validationStrategy;
- TargetInformationEntry targetInformationEntry;
+ PropertyDetails propertyDetails;
for (String targetExpression : targetExpressions)
{
- targetInformationEntry = ExtValUtils
+ propertyDetails = ExtValUtils
.createTargetInformationEntryForNewTarget(metaDataEntry, targetExpression);
- for (MetaDataEntry entry : extractor.extract(facesContext, targetInformationEntry).getMetaDataEntries())
+ for (MetaDataEntry entry : extractor.extract(facesContext, propertyDetails).getMetaDataEntries())
{
validationStrategy = ExtValUtils.getValidationStrategyForMetaData(entry.getKey());
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/SkipValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/SkipValidationStrategy.java?rev=711435&r1=711434&r2=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/SkipValidationStrategy.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/SkipValidationStrategy.java Tue Nov 4 13:58:53 2008
@@ -19,7 +19,7 @@
package org.apache.myfaces.extensions.validator.baseval.strategy;
import org.apache.myfaces.extensions.validator.baseval.annotation.SkipValidation;
-import org.apache.myfaces.extensions.validator.core.metadata.PropertySourceInformationKeys;
+import org.apache.myfaces.extensions.validator.core.property.PropertyInformationKeys;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.core.el.ValueBindingExpression;
@@ -50,7 +50,7 @@
if((Boolean)ExtValUtils.getELHelper().getValueOfExpression(
facesContext, new ValueBindingExpression(valueBindingExpression)))
{
- metaDataEntry.setProperty(PropertySourceInformationKeys.SKIP_VALIDATION, true);
+ metaDataEntry.setProperty(PropertyInformationKeys.SKIP_VALIDATION, true);
break;
}
}
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/recorder/CrossValidationUserInputRecorder.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/recorder/CrossValidationUserInputRecorder.java?rev=711435&r1=711434&r2=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/recorder/CrossValidationUserInputRecorder.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/recorder/CrossValidationUserInputRecorder.java Tue Nov 4 13:58:53 2008
@@ -19,7 +19,7 @@
package org.apache.myfaces.extensions.validator.crossval.recorder;
import org.apache.myfaces.extensions.validator.core.recorder.ProcessedInformationRecorder;
-import org.apache.myfaces.extensions.validator.core.el.TargetInformationEntry;
+import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
import org.apache.myfaces.extensions.validator.crossval.ProcessedInformationEntry;
import org.apache.myfaces.extensions.validator.util.CrossValidationUtils;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
@@ -53,21 +53,21 @@
ProcessedInformationEntry entry;
- TargetInformationEntry targetInformationEntry =
+ PropertyDetails propertyDetails =
ExtValUtils.getELHelper().getTargetInformation(uiComponent);
- if(targetInformationEntry == null)
+ if(propertyDetails == null)
{
return;
}
entry = new ProcessedInformationEntry();
- entry.setBean(targetInformationEntry.getBaseObject());
+ entry.setBean(propertyDetails.getBaseObject());
entry.setConvertedValue(value);
entry.setComponent(uiComponent);
entry.setClientId(uiComponent.getClientId(FacesContext.getCurrentInstance()));
- String key = targetInformationEntry.getKey();
+ String key = propertyDetails.getKey();
//for local cross-validation
if (keyToConvertedValueMapping.containsKey(key) &&
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/LocalCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/LocalCompareStrategy.java?rev=711435&r1=711434&r2=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/LocalCompareStrategy.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/LocalCompareStrategy.java Tue Nov 4 13:58:53 2008
@@ -25,9 +25,9 @@
import org.apache.myfaces.extensions.validator.util.CrossValidationUtils;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
-import org.apache.myfaces.extensions.validator.core.el.TargetInformationEntry;
+import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
import org.apache.myfaces.extensions.validator.core.el.ValueBindingExpression;
-import org.apache.myfaces.extensions.validator.core.metadata.PropertySourceInformationKeys;
+import org.apache.myfaces.extensions.validator.core.property.PropertyInformationKeys;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -67,8 +67,8 @@
.getOrInitKeyToConvertedValueMapping();
ProcessedInformationEntry validationTargetEntry;
- TargetInformationEntry targetInformationEntry = crossValidationStorageEntry.getMetaDataEntry()
- .getProperty(PropertySourceInformationKeys.TARGET_INFORMATION_ENTRY, TargetInformationEntry.class);
+ PropertyDetails propertyDetails = crossValidationStorageEntry.getMetaDataEntry()
+ .getProperty(PropertyInformationKeys.PROPERTY_DETAILS, PropertyDetails.class);
String newKey = createTargetKey(crossValidationStorageEntry, targetKey);
if (!keyConvertedValueMapping.containsKey(newKey))
@@ -76,7 +76,7 @@
return false;
}
- String sourceKey = targetInformationEntry.getKey();
+ String sourceKey = propertyDetails.getKey();
if(!sourceKey.contains("."))
{
@@ -92,7 +92,7 @@
{
if(logger.isWarnEnabled())
{
- logger.warn("couldn't find converted object for " + targetInformationEntry.getKey());
+ logger.warn("couldn't find converted object for " + propertyDetails.getKey());
}
return false;
@@ -113,8 +113,8 @@
//here only dot-notation is allowed -> no problem
ValueBindingExpression baseExpression =
new ValueBindingExpression("#{" + crossValidationStorageEntry.getMetaDataEntry()
- .getProperty(PropertySourceInformationKeys.TARGET_INFORMATION_ENTRY,
- TargetInformationEntry.class).getKey() + "}");
+ .getProperty(PropertyInformationKeys.PROPERTY_DETAILS,
+ PropertyDetails.class).getKey() + "}");
String result = ValueBindingExpression.replaceOrAddProperty(baseExpression, targetKey)
.getExpressionString();
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/LocalPropertyChainCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/LocalPropertyChainCompareStrategy.java?rev=711435&r1=711434&r2=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/LocalPropertyChainCompareStrategy.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/LocalPropertyChainCompareStrategy.java Tue Nov 4 13:58:53 2008
@@ -23,8 +23,8 @@
import org.apache.myfaces.extensions.validator.crossval.strategy.AbstractCompareStrategy;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
-import org.apache.myfaces.extensions.validator.core.el.TargetInformationEntry;
-import org.apache.myfaces.extensions.validator.core.metadata.PropertySourceInformationKeys;
+import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
+import org.apache.myfaces.extensions.validator.core.property.PropertyInformationKeys;
import org.apache.myfaces.extensions.validator.util.ReflectionUtils;
import java.lang.annotation.Annotation;
@@ -45,11 +45,11 @@
String targetKey,
AbstractCompareStrategy compareStrategy)
{
- TargetInformationEntry targetInformationEntry = crossValidationStorageEntry.getMetaDataEntry()
- .getProperty(PropertySourceInformationKeys.TARGET_INFORMATION_ENTRY, TargetInformationEntry.class);
+ PropertyDetails propertyDetails = crossValidationStorageEntry.getMetaDataEntry()
+ .getProperty(PropertyInformationKeys.PROPERTY_DETAILS, PropertyDetails.class);
Object newBase = ReflectionUtils
- .getBaseOfPropertyChain(targetInformationEntry.getBaseObject(), targetKey);
+ .getBaseOfPropertyChain(propertyDetails.getBaseObject(), targetKey);
if(targetKey.contains("."))
{
@@ -67,6 +67,7 @@
CrossValidationStorageEntry tmpCrossValidationStorageEntry = new CrossValidationStorageEntry();
tmpCrossValidationStorageEntry.setComponent(crossValidationStorageEntry.getComponent());
+ tmpCrossValidationStorageEntry.setClientId(crossValidationStorageEntry.getClientId());
tmpCrossValidationStorageEntry.setConvertedObject(targetValue);
tmpCrossValidationStorageEntry.setValidationStrategy(compareStrategy);
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java?rev=711435&r1=711434&r2=711435&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java Tue Nov 4 13:58:53 2008
@@ -39,8 +39,8 @@
import org.apache.myfaces.extensions.validator.util.ClassUtils;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.CustomInfo;
-import org.apache.myfaces.extensions.validator.core.el.TargetInformationEntry;
-import org.apache.myfaces.extensions.validator.core.metadata.PropertySourceInformationKeys;
+import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
+import org.apache.myfaces.extensions.validator.core.property.PropertyInformationKeys;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -155,7 +155,8 @@
entryOfSource.getMetaDataEntry().getValue(Annotation.class), summary, details);
}
- if (message.getSummary() != null || message.getDetail() != null)
+ if ((message.getSummary() != null || message.getDetail() != null) &&
+ entryOfSource.getClientId() != null && !entryOfSource.getClientId().equals(entryOfTarget.getClientId()))
{
facesContext.addMessage(entryOfTarget.getClientId(), message);
}
@@ -225,10 +226,10 @@
return processedInformationEntry;
}
- TargetInformationEntry targetInformationEntry = crossValidationStorageEntry.getMetaDataEntry()
- .getProperty(PropertySourceInformationKeys.TARGET_INFORMATION_ENTRY, TargetInformationEntry.class);
+ PropertyDetails propertyDetails = crossValidationStorageEntry.getMetaDataEntry()
+ .getProperty(PropertyInformationKeys.PROPERTY_DETAILS, PropertyDetails.class);
- Object targetBean = targetInformationEntry.getBaseObject();
+ Object targetBean = propertyDetails.getBaseObject();
//process complex component entries (e.g. a table)
//supported: cross-component but no cross-entity validation (= locale validation)