rleland 2003/09/28 10:02:51 Modified: src/share/org/apache/struts/taglib/html JavascriptValidatorTag.java src/share/org/apache/struts/validator FieldChecks.java Resources.java ValidatorPlugIn.java Log: Remove most deprecated messages for commons-validator() Still need to initialize ValidatorResources(). Revision Changes Path 1.39 +13 -13 jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java Index: JavascriptValidatorTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- JavascriptValidatorTag.java 27 Aug 2003 23:33:25 -0000 1.38 +++ JavascriptValidatorTag.java 28 Sep 2003 17:02:51 -0000 1.39 @@ -78,7 +78,7 @@ import org.apache.commons.validator.Form; import org.apache.commons.validator.ValidatorAction; import org.apache.commons.validator.ValidatorResources; -import org.apache.commons.validator.ValidatorUtil; +import org.apache.commons.validator.util.ValidatorUtils; import org.apache.commons.validator.Var; import org.apache.struts.Globals; import org.apache.struts.config.ModuleConfig; @@ -123,7 +123,7 @@ return -1; } else { - return va1.getDependencies().size() - va2.getDependencies().size(); + return va1.getDependencyList().size() - va2.getDependencyList().size(); } } }; @@ -368,7 +368,7 @@ Locale locale = TagUtils.getInstance().getUserLocale(this.pageContext, null); - Form form = resources.get(locale, formName); + Form form = resources.getForm(locale, formName); if (form != null) { if ("true".equalsIgnoreCase(dynamicJavascript)) { results.append( @@ -482,21 +482,21 @@ "this." + varName + "=" - + ValidatorUtil.replace(varValue, "\\", "\\\\") + + ValidatorUtils.replace(varValue, "\\", "\\\\") + "; "); } else if (Var.JSTYPE_REGEXP.equalsIgnoreCase(jsType)) { results.append( "this." + varName + "=/" - + ValidatorUtil.replace(varValue, "\\", "\\\\") + + ValidatorUtils.replace(varValue, "\\", "\\\\") + "/; "); } else if (Var.JSTYPE_STRING.equalsIgnoreCase(jsType)) { results.append( "this." + varName + "='" - + ValidatorUtil.replace(varValue, "\\", "\\\\") + + ValidatorUtils.replace(varValue, "\\", "\\\\") + "'; "); // So everyone using the latest format doesn't need to change their xml files immediately. } else if ("mask".equalsIgnoreCase(varName)) { @@ -504,14 +504,14 @@ "this." + varName + "=/" - + ValidatorUtil.replace(varValue, "\\", "\\\\") + + ValidatorUtils.replace(varValue, "\\", "\\\\") + "/; "); } else { results.append( "this." + varName + "='" - + ValidatorUtil.replace(varValue, "\\", "\\\\") + + ValidatorUtils.replace(varValue, "\\", "\\\\") + "'; "); } } @@ -584,7 +584,7 @@ while (iterator.hasNext()) { Field field = (Field) iterator.next(); - for (Iterator x = field.getDependencies().iterator(); x.hasNext();) { + for (Iterator x = field.getDependencyList().iterator(); x.hasNext();) { Object o = x.next(); if (o != null && !actionMethods.contains(o)) { 1.14 +23 -23 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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- FieldChecks.java 26 Sep 2003 18:12:24 -0000 1.13 +++ FieldChecks.java 28 Sep 2003 17:02:51 -0000 1.14 @@ -72,7 +72,7 @@ import org.apache.commons.validator.GenericTypeValidator; import org.apache.commons.validator.GenericValidator; import org.apache.commons.validator.ValidatorAction; -import org.apache.commons.validator.ValidatorUtil; +import org.apache.commons.validator.util.ValidatorUtils; import org.apache.struts.action.ActionMessages; import org.apache.struts.util.RequestUtils; @@ -125,7 +125,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } if (GenericValidator.isBlankOrNull(value)) { @@ -158,14 +158,14 @@ org.apache.commons.validator.Validator validator, HttpServletRequest request) { - Object form = validator.getResource(org.apache.commons.validator.Validator.BEAN_KEY); + Object form = validator.getParameterValue(org.apache.commons.validator.Validator.BEAN_PARAM); String value = null; boolean required = false; if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } int i = 0; @@ -198,7 +198,7 @@ } } - dependVal = ValidatorUtil.getValueAsString(form, dependProp); + dependVal = ValidatorUtils.getValueAsString(form, dependProp); if (dependTest.equals(FIELD_TEST_NULL)) { if ((dependVal != null) && (dependVal.length() > 0)) { thisRequired = false; @@ -266,7 +266,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } try { @@ -310,7 +310,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } if (!GenericValidator.isBlankOrNull(value)) { @@ -346,7 +346,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } if (!GenericValidator.isBlankOrNull(value)) { @@ -382,7 +382,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } if (!GenericValidator.isBlankOrNull(value)) { @@ -418,7 +418,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } if (!GenericValidator.isBlankOrNull(value)) { @@ -454,7 +454,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } if (!GenericValidator.isBlankOrNull(value)) { @@ -490,7 +490,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } if (!GenericValidator.isBlankOrNull(value)) { @@ -533,7 +533,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } String datePattern = field.getVarValue("datePattern"); String datePatternStrict = field.getVarValue("datePatternStrict"); @@ -603,7 +603,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } if (!GenericValidator.isBlankOrNull(value)) { @@ -648,7 +648,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } if (!GenericValidator.isBlankOrNull(value)) { @@ -693,7 +693,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } if (!GenericValidator.isBlankOrNull(value)) { @@ -739,7 +739,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } if (!GenericValidator.isBlankOrNull(value)) { @@ -775,7 +775,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } if (!GenericValidator.isBlankOrNull(value) && !GenericValidator.isEmail(value)) { @@ -809,7 +809,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } if (value != null) { @@ -853,7 +853,7 @@ if (isString(bean)) { value = (String) bean; } else { - value = ValidatorUtil.getValueAsString(bean, field.getProperty()); + value = ValidatorUtils.getValueAsString(bean, field.getProperty()); } if (!GenericValidator.isBlankOrNull(value)) { 1.23 +14 -14 jakarta-struts/src/share/org/apache/struts/validator/Resources.java Index: Resources.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/validator/Resources.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Resources.java 26 Sep 2003 19:14:06 -0000 1.22 +++ Resources.java 28 Sep 2003 17:02:51 -0000 1.23 @@ -291,17 +291,17 @@ Arg[] args = new Arg[] { - field.getArg0(actionName), - field.getArg1(actionName), - field.getArg2(actionName), - field.getArg3(actionName)}; + field.getArg(actionName,0), + field.getArg(actionName,1), + field.getArg(actionName,2), + field.getArg(actionName,3)}; for (int i = 0; i < args.length; i++) { if (args[i] == null) { continue; } - if (args[i].getResource()) { + if (args[i].isResource()) { argMessages[i] = getMessage(messages, locale, args[i].getKey()); } else { argMessages[i] = args[i].getKey(); @@ -343,11 +343,11 @@ validator.setPage(page); - validator.addResource(SERVLET_CONTEXT_PARAM, application); - validator.addResource(HTTP_SERVLET_REQUEST_PARAM, request); - validator.addResource(Validator.LOCALE_KEY, locale); - validator.addResource(ACTION_ERRORS_PARAM, errors); - validator.addResource(Validator.BEAN_KEY, bean); + validator.setParameter(SERVLET_CONTEXT_PARAM, application); + validator.setParameter(HTTP_SERVLET_REQUEST_PARAM, request); + validator.setParameter(Validator.LOCALE_PARAM, locale); + validator.setParameter(ACTION_ERRORS_PARAM, errors); + validator.setParameter(Validator.BEAN_PARAM, bean); return validator; } 1.20 +5 -5 jakarta-struts/src/share/org/apache/struts/validator/ValidatorPlugIn.java Index: ValidatorPlugIn.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/validator/ValidatorPlugIn.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ValidatorPlugIn.java 27 Aug 2003 23:44:02 -0000 1.19 +++ ValidatorPlugIn.java 28 Sep 2003 17:02:51 -0000 1.20 @@ -236,7 +236,7 @@ * @exception ServletException if we cannot initialize these resources, not thrown by this implementation */ protected void initResources() throws IOException, ServletException { - this.resources = new ValidatorResources(); + this.resources = new ValidatorResources(pathnames); if (pathnames == null || pathnames.length() <= 0) { return;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]