jholmes 2004/06/08 12:59:38
Modified: contrib/struts-faces/src/java/org/apache/struts/faces/taglib
JavascriptValidatorTag.java
Log:
applied patch in bug 29219 by Michael Rasmussen to work with latest
Commons Validator code.
Revision Changes Path
1.5 +8 -8
jakarta-struts/contrib/struts-faces/src/java/org/apache/struts/faces/taglib/JavascriptValidatorTag.java
Index: JavascriptValidatorTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/src/java/org/apache/struts/faces/taglib/JavascriptValidatorTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JavascriptValidatorTag.java 8 Mar 2004 02:49:54 -0000 1.4
+++ JavascriptValidatorTag.java 8 Jun 2004 19:59:38 -0000 1.5
@@ -38,8 +38,8 @@
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.Var;
+import org.apache.commons.validator.util.ValidatorUtils;
import org.apache.struts.Globals;
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.faces.component.FormComponent;
@@ -275,7 +275,7 @@
Locale locale = RequestUtils.retrieveUserLocale(this.pageContext, null);
- Form form = resources.get(locale, formName);
+ Form form = resources.getForm(locale, formName);
if (form != null) {
if ("true".equalsIgnoreCase(dynamicJavascript)) {
MessageResources messages =
@@ -419,7 +419,7 @@
"this."
+ varName
+ "="
- + ValidatorUtil.replace(
+ + ValidatorUtils.replace(
varValue,
"\\",
"\\\\")
@@ -429,7 +429,7 @@
"this."
+ varName
+ "=/"
- + ValidatorUtil.replace(
+ + ValidatorUtils.replace(
varValue,
"\\",
"\\\\")
@@ -439,7 +439,7 @@
"this."
+ varName
+ "='"
- + ValidatorUtil.replace(
+ + ValidatorUtils.replace(
varValue,
"\\",
"\\\\")
@@ -450,7 +450,7 @@
"this."
+ varName
+ "=/"
- + ValidatorUtil.replace(
+ + ValidatorUtils.replace(
varValue,
"\\",
"\\\\")
@@ -460,7 +460,7 @@
"this."
+ varName
+ "='"
- + ValidatorUtil.replace(
+ + ValidatorUtils.replace(
varValue,
"\\",
"\\\\")
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
