struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jhol...@apache.org
Subject cvs commit: jakarta-struts/contrib/struts-faces/src/java/org/apache/struts/faces/taglib JavascriptValidatorTag.java
Date Wed, 09 Jun 2004 02:08:10 GMT
jholmes     2004/06/08 19:08:10

  Modified:    contrib/struts-faces/src/java/org/apache/struts/faces/taglib
                        JavascriptValidatorTag.java
  Log:
  Reverted changes made for 29219 so that the nightly build (which compiles against 1.1) will
work.
  
  Revision  Changes    Path
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JavascriptValidatorTag.java	8 Jun 2004 19:59:38 -0000	1.5
  +++ JavascriptValidatorTag.java	9 Jun 2004 02:08:10 -0000	1.6
  @@ -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.getForm(locale, formName);
  +        Form form = resources.get(locale, formName);
           if (form != null) {
               if ("true".equalsIgnoreCase(dynamicJavascript)) {
                   MessageResources messages =
  @@ -419,7 +419,7 @@
                                       "this."
                                           + varName
                                           + "="
  -                                        + ValidatorUtils.replace(
  +                                        + ValidatorUtil.replace(
                                               varValue,
                                               "\\",
                                               "\\\\")
  @@ -429,7 +429,7 @@
                                       "this."
                                           + varName
                                           + "=/"
  -                                        + ValidatorUtils.replace(
  +                                        + ValidatorUtil.replace(
                                               varValue,
                                               "\\",
                                               "\\\\")
  @@ -439,7 +439,7 @@
                                       "this."
                                           + varName
                                           + "='"
  -                                        + ValidatorUtils.replace(
  +                                        + ValidatorUtil.replace(
                                               varValue,
                                               "\\",
                                               "\\\\")
  @@ -450,7 +450,7 @@
                                       "this."
                                           + varName
                                           + "=/"
  -                                        + ValidatorUtils.replace(
  +                                        + ValidatorUtil.replace(
                                               varValue,
                                               "\\",
                                               "\\\\")
  @@ -460,7 +460,7 @@
                                       "this."
                                           + varName
                                           + "='"
  -                                        + ValidatorUtils.replace(
  +                                        + ValidatorUtil.replace(
                                               varValue,
                                               "\\",
                                               "\\\\")
  
  
  

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


Mime
View raw message