svn commit: r497643 - /velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ValidatorTool.java

[nb...@apache.org]

Author: nbubna
Date: Thu Jan 18 15:54:14 2007
New Revision: 497643

URL: http://svn.apache.org/viewvc?view=rev&rev=497643
Log:
update to mirror key changes in Struts 1.3.x's JavascriptValidatorTag (thx to Niall Pemberton and Christopher Schultz) VELTOOLS-58

Modified:
    velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ValidatorTool.java

Modified: velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ValidatorTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ValidatorTool.java?view=diff&rev=497643&r1=497642&r2=497643
==============================================================================
--- velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ValidatorTool.java (original)
+++ velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ValidatorTool.java Thu Jan 18 15:54:14 2007
@@ -502,8 +502,8 @@
                     continue;
                 }
 
-                String message =
-                    Resources.getMessage(messages, locale, va, field);
+                String message = Resources.getMessage(app, request, messages,
+                                                      locale, va, field);
 
                 message = (message != null) ? message : "";
 
@@ -525,7 +525,8 @@
                 {
                     String varName = (String)varsIterator.next(); // TODO: escape?
                     Var var = (Var)vars.get(varName);
-                    String varValue = var.getValue();
+                    String varValue =
+                        Resources.getVarValue(var, app, request, false);
                     String jsType = var.getJsType();
 
                     // skip requiredif variables field, fieldIndexed, fieldTest, fieldValue