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 2010/11/17 01:16:58 UTC
svn commit: r1035874 -
/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractor.java
Author: gpetracek
Date: Wed Nov 17 00:16:58 2010
New Revision: 1035874
URL: http://svn.apache.org/viewvc?rev=1035874&view=rev
Log:
minor change
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractor.java
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractor.java?rev=1035874&r1=1035873&r2=1035874&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractor.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractor.java Wed Nov 17 00:16:58 2010
@@ -58,8 +58,6 @@ public class DefaultComponentMetaDataExt
@ToDo(Priority.MEDIUM)
public PropertyInformation extract(FacesContext facesContext, Object object)
{
- PropertyInformation propertyInformation = new DefaultPropertyInformation();
-
//should never occur
if (!(object instanceof UIComponent))
{
@@ -67,7 +65,7 @@ public class DefaultComponentMetaDataExt
{
this.logger.warning(object.getClass() + " is no valid component");
}
- return propertyInformation;
+ return new DefaultPropertyInformation();
}
UIComponent uiComponent = (UIComponent) object;
@@ -78,7 +76,7 @@ public class DefaultComponentMetaDataExt
if (propertyDetails == null)
{
- return propertyInformation;
+ return new DefaultPropertyInformation();
}
/*
@@ -86,8 +84,19 @@ public class DefaultComponentMetaDataExt
*/
Class entityClass = ProxyUtils.getUnproxiedClass(propertyDetails.getBaseObject().getClass());
+ PropertyInformation propertyInformation = getPropertyInformation(entityClass, propertyDetails);
+
+ logger.finest("extract finished");
+
+ return propertyInformation;
+ }
+
+ protected PropertyInformation getPropertyInformation(Class entityClass, PropertyDetails propertyDetails)
+ {
MetaDataStorage storage = getMetaDataStorage();
+ PropertyInformation propertyInformation = new DefaultPropertyInformation();
+
if (isCached(storage, entityClass, propertyDetails.getProperty()))
{
//create
@@ -103,9 +112,6 @@ public class DefaultComponentMetaDataExt
propertyInformation = ExtValAnnotationUtils.extractAnnotations(entityClass, propertyDetails);
cacheMetaData(storage, propertyInformation);
}
-
- logger.finest("extract finished");
-
return propertyInformation;
}