commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgra...@apache.org
Subject cvs commit: jakarta-commons/validator/src/test/org/apache/commons/validator TestValidator.java validator-requiredif.xml
Date Sat, 15 Mar 2003 22:28:20 GMT
dgraham     2003/03/15 14:28:20

  Modified:    validator/src/test/org/apache/commons/validator
                        TestValidator.java validator-requiredif.xml
  Log:
  Changed field-* variables to camel case and no "-" for PR #18018.
  
  Revision  Changes    Path
  1.6       +9 -9      jakarta-commons/validator/src/test/org/apache/commons/validator/TestValidator.java
  
  Index: TestValidator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/TestValidator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestValidator.java	19 Sep 2002 17:11:46 -0000	1.5
  +++ TestValidator.java	15 Mar 2003 22:28:20 -0000	1.6
  @@ -201,17 +201,17 @@
       }
       int i = 0;
       String fieldJoin = "AND";
  -    if (!GenericValidator.isBlankOrNull(field.getVarValue("field-join"))) {
  -      fieldJoin = field.getVarValue("field-join");
  +    if (!GenericValidator.isBlankOrNull(field.getVarValue("fieldJoin"))) {
  +      fieldJoin = field.getVarValue("fieldJoin");
       }
       if (fieldJoin.equalsIgnoreCase("AND")) {
         required = true;
       }
       while (!GenericValidator.isBlankOrNull(field.getVarValue("field[" + i + "]"))) {
         String dependProp = field.getVarValue("field[" + i + "]");
  -      String dependTest = field.getVarValue("field-test[" + i + "]");
  -      String dependTestValue = field.getVarValue("field-value[" + i + "]");
  -      String dependIndexed = field.getVarValue("field-indexed[" + i + "]");
  +      String dependTest = field.getVarValue("fieldTest[" + i + "]");
  +      String dependTestValue = field.getVarValue("fieldValue[" + i + "]");
  +      String dependIndexed = field.getVarValue("fieldIndexed[" + i + "]");
         if (dependIndexed == null) dependIndexed="false";
         String dependVal = null;
         boolean this_required = false;
  
  
  
  1.2       +2 -2      jakarta-commons/validator/src/test/org/apache/commons/validator/validator-requiredif.xml
  
  Index: validator-requiredif.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/validator-requiredif.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- validator-requiredif.xml	19 Sep 2002 17:11:46 -0000	1.1
  +++ validator-requiredif.xml	15 Mar 2003 22:28:20 -0000	1.2
  @@ -14,7 +14,7 @@
                      <var-value>lastName</var-value>
                     </var>
                     <var>
  -                   <var-name>field-test[0]</var-name>
  +                   <var-name>fieldTest[0]</var-name>
                      <var-value>NOTNULL</var-value>
                     </var>
            </field>    
  @@ -26,7 +26,7 @@
                      <var-value>firstName</var-value>
                     </var>
                     <var>
  -                   <var-name>field-test[0]</var-name>
  +                   <var-name>fieldTest[0]</var-name>
                      <var-value>NOTNULL</var-value>
                     </var>
            </field>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message