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/08/17 14:03:25 UTC
svn commit: r986283 - in
/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el:
DefaultELHelper.java ExtValELResolver.java
Author: gpetracek
Date: Tue Aug 17 12:03:25 2010
New Revision: 986283
URL: http://svn.apache.org/viewvc?rev=986283&view=rev
Log:
EXTVAL-113
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/ExtValELResolver.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=986283&r1=986282&r2=986283&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 Aug 17 12:03:25 2010
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.extensions.validator.core.el;
+import org.apache.myfaces.extensions.validator.core.JsfProjectStage;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.ToDo;
@@ -58,6 +59,8 @@ public class DefaultELHelper implements
protected final Logger logger = Logger.getLogger(getClass().getName());
+ protected final boolean projectStageDevelopment = JsfProjectStage.is(JsfProjectStage.Development);
+
public DefaultELHelper()
{
logger.fine(getClass().getName() + " instantiated");
@@ -150,7 +153,9 @@ public class DefaultELHelper implements
FacesContext facesContext = FacesContext.getCurrentInstance();
- ExtValELResolver elResolver = new ExtValELResolver(facesContext.getApplication().getELResolver());
+ ExtValELResolver elResolver =
+ new ExtValELResolver(facesContext.getApplication().getELResolver(), this.projectStageDevelopment);
+
ELContext elContext = ExtValELResolver.createContextWrapper(facesContext.getELContext(), elResolver);
ValueExpression valueExpression = uiComponent.getValueExpression("value");
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ExtValELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ExtValELResolver.java?rev=986283&r1=986282&r2=986283&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ExtValELResolver.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ExtValELResolver.java Tue Aug 17 12:03:25 2010
@@ -42,15 +42,19 @@ public class ExtValELResolver extends EL
protected final Logger logger = Logger.getLogger(getClass().getName());
private ELResolver wrapped;
+
+ private boolean projectStageDevelopment;
+
private Object baseObject;
private String property;
//forms the id for cross-validation within complex components
private String expression;
private boolean isPathRecordingStopped = false;
- public ExtValELResolver(ELResolver elResolver)
+ public ExtValELResolver(ELResolver elResolver, boolean projectStageDevelopment)
{
this.wrapped = elResolver;
+ this.projectStageDevelopment = projectStageDevelopment;
}
public Object getBaseObject()
@@ -171,7 +175,16 @@ public class ExtValELResolver extends EL
public void setValue(ELContext elContext, Object o, Object o1, Object o2)
{
expression += "." + o1;
- property = (String)o1;
+
+ if(o1 instanceof String)
+ {
+ property = (String)o1;
+ }
+ else
+ {
+ logWarningForUnsupportedExpression(o1);
+ }
+
baseObject = o;
elContext.setPropertyResolved(true);
}
@@ -248,4 +261,19 @@ public class ExtValELResolver extends EL
};
}
+
+ private void logWarningForUnsupportedExpression(Object o1)
+ {
+ if(this.projectStageDevelopment)
+ {
+ try
+ {
+ this.logger.warning(o1 + " is not a valid property for constraint based validation.");
+ }
+ catch (NullPointerException e)
+ {
+ this.logger.warning("A property which doesn't support constraint based validation has been detected.");
+ }
+ }
+ }
}