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/06/16 21:31:04 UTC
svn commit: r955355 - in
/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator:
core/el/DefaultELHelper.java util/ReflectionUtils.java
Author: gpetracek
Date: Wed Jun 16 19:31:04 2010
New Revision: 955355
URL: http://svn.apache.org/viewvc?rev=955355&view=rev
Log:
cleanup
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/util/ReflectionUtils.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=955355&r1=955354&r2=955355&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 Wed Jun 16 19:31:04 2010
@@ -22,7 +22,6 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.Priority;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import org.apache.myfaces.extensions.validator.util.ReflectionUtils;
import org.apache.myfaces.extensions.validator.util.ProxyUtils;
import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
@@ -129,8 +128,7 @@ public class DefaultELHelper implements
return null;
}
- Class entityClass = ExtValUtils.getELHelper()
- .getTypeOfExpression(facesContext, result.getBaseExpression());
+ Class entityClass = getTypeOfExpression(facesContext, result.getBaseExpression());
if(entityClass == null)
{
@@ -234,7 +232,7 @@ public class DefaultELHelper implements
{
String[] properties = propertyChain.split("\\.");
- Object currentPropertyValue = ExtValUtils.getELHelper().getBean(properties[0]);
+ Object currentPropertyValue = getBean(properties[0]);
Method currentMethod;
String currentPropertyName;
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ReflectionUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ReflectionUtils.java?rev=955355&r1=955354&r2=955355&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ReflectionUtils.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/util/ReflectionUtils.java Wed Jun 16 19:31:04 2010
@@ -197,8 +197,7 @@ public class ReflectionUtils
//no is - it's only possible at properties not at bean level
currentMethod = tryToGetMethod(ProxyUtils.getUnproxiedClass(currentBase.getClass()),
- "get" + currentProperty.substring(0, 1).toUpperCase() +
- currentProperty.substring(1, currentProperty.length()));
+ "get" + currentProperty.substring(0, 1).toUpperCase() + currentProperty.substring(1));
currentBase = tryToInvokeMethod(currentBase, currentMethod);
}