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/30 17:46:25 UTC
svn commit: r721852 - 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/util/
validation-modules/property-validation/src/main/java/org/...
Author: gpetracek
Date: Sun Nov 30 08:46:24 2008
New Revision: 721852
URL: http://svn.apache.org/viewvc?rev=721852&view=rev
Log:
minor refactoring
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/el/FaceletsTaglibExpressionHelper.java
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ValueBindingExpression.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/crossval/strategy/ELCompareStrategy.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=721852&r1=721851&r2=721852&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 Sun Nov 30 08:46:24 2008
@@ -82,7 +82,7 @@
facesContext, valueBindingExpression.getExpressionString(), Object.class) : null;
}
- public boolean isExpressionValid(FacesContext facesContext, String valueBindingExpression)
+ public boolean isELTermValid(FacesContext facesContext, String valueBindingExpression)
{
try
{
@@ -230,7 +230,7 @@
return (valueExpression != null) ? valueExpression.getExpressionString() : null;
}
- public boolean isELTerm(Object o)
+ public boolean isELTermWellFormed(Object o)
{
if (o instanceof ValueBinding || o instanceof Externalizable)
{
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=721852&r1=721851&r2=721852&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 Sun Nov 30 08:46:24 2008
@@ -42,9 +42,9 @@
PropertyDetails getPropertyDetailsOfValueBinding(UIComponent uiComponent);
- boolean isExpressionValid(FacesContext facesContext, String valueBindingExpression);
+ boolean isELTermValid(FacesContext facesContext, String valueBindingExpression);
- boolean isELTerm(Object o);
+ boolean isELTermWellFormed(Object o);
Object getBindingOfComponent(UIComponent uiComponent, String name);
}
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/FaceletsTaglibExpressionHelper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/FaceletsTaglibExpressionHelper.java?rev=721852&r1=721851&r2=721852&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/FaceletsTaglibExpressionHelper.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/FaceletsTaglibExpressionHelper.java Sun Nov 30 08:46:24 2008
@@ -234,7 +234,7 @@
return elCount;
}
- if (ExtValUtils.getELHelper().isELTerm(o))
+ if (ExtValUtils.getELHelper().isELTermWellFormed(o))
{
if (foundELTerms != null)
{
@@ -254,7 +254,7 @@
{
if (o.toString().startsWith("[Ljava.lang.String"))
{
- if (ExtValUtils.getELHelper().isELTerm(Array.get(o, i)))
+ if (ExtValUtils.getELHelper().isELTermWellFormed(Array.get(o, i)))
{
if (foundELTerms != null)
{
@@ -285,7 +285,7 @@
if (currentField.getType().equals(String.class))
{
- if (currentField.get(o) != null && ExtValUtils.getELHelper().isELTerm(currentField.get(o)))
+ if (currentField.get(o) != null && ExtValUtils.getELHelper().isELTermWellFormed(currentField.get(o)))
{
if (foundELTerms != null)
{
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ValueBindingExpression.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ValueBindingExpression.java?rev=721852&r1=721851&r2=721852&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ValueBindingExpression.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ValueBindingExpression.java Sun Nov 30 08:46:24 2008
@@ -85,7 +85,7 @@
public ValueBindingExpression(String expression)
{
- if(!ExtValUtils.getELHelper().isELTerm(expression))
+ if(!ExtValUtils.getELHelper().isELTermWellFormed(expression))
{
throw new IllegalStateException(expression + " is no valid el-expression");
}
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=721852&r1=721851&r2=721852&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 Sun Nov 30 08:46:24 2008
@@ -130,7 +130,7 @@
String targetExpression)
{
Object baseObject;
- if(ExtValUtils.getELHelper().isELTerm(targetExpression))
+ if(ExtValUtils.getELHelper().isELTermWellFormed(targetExpression))
{
ValueBindingExpression vbe = new ValueBindingExpression(targetExpression);
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/ELCompareStrategy.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/ELCompareStrategy.java?rev=721852&r1=721851&r2=721852&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/ELCompareStrategy.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/ELCompareStrategy.java Sun Nov 30 08:46:24 2008
@@ -53,8 +53,8 @@
CrossValidationStorage crossValidationStorage,
String validationTarget, AbstractCompareStrategy compareStrategy)
{
- if (ExtValUtils.getELHelper().isELTerm(validationTarget) &&
- ExtValUtils.getELHelper().isExpressionValid(FacesContext.getCurrentInstance(), validationTarget))
+ if (ExtValUtils.getELHelper().isELTermWellFormed(validationTarget) &&
+ ExtValUtils.getELHelper().isELTermValid(FacesContext.getCurrentInstance(), validationTarget))
{
tryToValidateValueBinding(crossValidationStorageEntry,
new ValueBindingExpression(validationTarget), crossValidationStorage, compareStrategy);