dgraham 2003/03/15 14:27:44 Modified: doc/userGuide dev_validator.xml src/share/org/apache/struts/validator FieldChecks.java Log: Changed field-* variables to camel case and no "-" for PR #18018. Revision Changes Path 1.25 +10 -10 jakarta-struts/doc/userGuide/dev_validator.xml Index: dev_validator.xml =================================================================== RCS file: /home/cvs/jakarta-struts/doc/userGuide/dev_validator.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- dev_validator.xml 13 Mar 2003 01:59:39 -0000 1.24 +++ dev_validator.xml 15 Mar 2003 22:27:44 -0000 1.25 @@ -562,11 +562,11 @@ <var-value>lastName</var-value> </var> <var> - <var-name>field-indexed[0]</var-name> + <var-name>fieldIndexed[0]</var-name> <var-value>true</var-value> </var> <var> - <var-name>field-test[0]</var-name> + <var-name>field_test[0]</var-name> <var-value>NOTNULL</var-value> </var> </field> @@ -581,11 +581,11 @@ <var-value>lastName</var-value> </var> <var> - <var-name>field-indexed[0]</var-name> + <var-name>fieldIndexed[0]</var-name> <var-value>true</var-value> </var> <var> - <var-name>field-test[0]</var-name> + <var-name>fieldTest[0]</var-name> <var-value>NOTNULL</var-value> </var> </field> @@ -600,11 +600,11 @@ <var-value>lastName</var-value> </var> <var> - <var-name>field-indexed[0]</var-name> + <var-name>fieldIndexed[0]</var-name> <var-value>true</var-value> </var> <var> - <var-name>field-test[0]</var-name> + <var-name>fieldTest[0]</var-name> <var-value>NOTNULL</var-value> </var> <var> @@ -612,15 +612,15 @@ <var-value>insureDependents</var-value> </var> <var> - <var-name>field-test[1]</var-name> + <var-name>fieldTest[1]</var-name> <var-value>EQUAL</var-value> </var> <var> - <var-name>field-value[1]</var-name> + <var-name>fieldValue[1]</var-name> <var-value>true</var-value> </var> <var> - <var-name>field-join</var-name> + <var-name>fieldJoin</var-name> <var-value>AND</var-value> </var> </field> @@ -632,7 +632,7 @@ <p> Which is read as follows: The firstName field is only required if the lastName field is non-null. - Since field-indexed is true, it means that lastName must be a property of + Since fieldIndexed is true, it means that lastName must be a property of the same indexed field as firstName. Same thing for dob, except that we validate for date if not blank. </p> 1.6 +5 -5 jakarta-struts/src/share/org/apache/struts/validator/FieldChecks.java Index: FieldChecks.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/validator/FieldChecks.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- FieldChecks.java 25 Feb 2003 04:58:29 -0000 1.5 +++ FieldChecks.java 15 Mar 2003 22:27:44 -0000 1.6 @@ -163,17 +163,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;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]