svn commit: r687553 - in /myfaces/commons/trunk/myfaces-commons-validators/src/main: java/org/apache/myfaces/commons/validator/ resources/META-INF/

[lu...@apache.org]

Author: lu4242
Date: Wed Aug 20 21:27:24 2008
New Revision: 687553

URL: http://svn.apache.org/viewvc?rev=687553&view=rev
Log:
small fixes in code

Modified:
    myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCompareToValidator.java
    myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java
    myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/tagValidatorClass12.vm

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCompareToValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCompareToValidator.java?rev=687553&r1=687552&r2=687553&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCompareToValidator.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCompareToValidator.java Wed Aug 20 21:27:24 2008
@@ -196,17 +196,17 @@
 
     protected String nameForOperator(String operator)
     {
-        if (OPERATOR_EQUALS == operator)
+        if (OPERATOR_EQUALS.equals(operator))
             return "equal to";
-        else if (OPERATOR_NOT_EQUALS == operator)
+        else if (OPERATOR_NOT_EQUALS.equals(operator))
             return "inequal to";
-        else if (OPERATOR_GREATER_THAN == operator)
+        else if (OPERATOR_GREATER_THAN.equals(operator))
             return "greater than";
-        else if (OPERATOR_LESS_THAN == operator)
+        else if (OPERATOR_LESS_THAN.equals(operator))
             return "less than";
-        else if (OPERATOR_GREATER_THAN_OR_EQUALS == operator)
+        else if (OPERATOR_GREATER_THAN_OR_EQUALS.equals(operator))
             return "greater than or equal to";
-        else if (OPERATOR_LESS_THAN_OR_EQUALS == operator)
+        else if (OPERATOR_LESS_THAN_OR_EQUALS.equals(operator))
             return "less than or equal to";
 
         throw new IllegalStateException("Operator has unknown value of '" + operator + "'");

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java?rev=687553&r1=687552&r2=687553&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java Wed Aug 20 21:27:24 2008
@@ -27,7 +27,6 @@
 import java.util.Set;
 
 import javax.faces.application.FacesMessage;
-import javax.faces.component.StateHolder;
 import javax.faces.component.UIComponent;
 import javax.faces.component.ValueHolder;
 import javax.faces.context.FacesContext;
@@ -49,7 +48,6 @@
  *
  */
 public abstract class AbstractDateRestrictionValidator extends ValidatorBase
-        implements Validator, StateHolder
 {
 
     public static final String VALIDATOR_ID = "org.apache.myfaces.commons.validator.DateRestriction";

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/tagValidatorClass12.vm
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/tagValidatorClass12.vm?rev=687553&r1=687552&r2=687553&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/tagValidatorClass12.vm (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/tagValidatorClass12.vm Wed Aug 20 21:27:24 2008
@@ -64,10 +64,12 @@
     }
     
     protected void _setProperties(Validator val) throws JspException {
-        super._setProperties(val);    
+        super._setProperties(val);
+#if ($propertyList.size() > 0)
         FacesContext facesContext = FacesContext.getCurrentInstance();
 
         $validator.className validator = ($validator.className) val;
+#end
 #foreach( $property in $propertyList )
 #set ($field = $property.fieldName)
 #set ($type = $utils.getJspPropertyType12($property))