You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by nb...@apache.org on 2003/07/25 18:54:40 UTC
cvs commit: jakarta-velocity-tools/src/java/org/apache/velocity/tools/struts ActionMessagesTool.java ErrorsTool.java MessageTool.java
nbubna 2003/07/25 09:54:40
Modified: src/java/org/apache/velocity/tools/struts
ActionMessagesTool.java ErrorsTool.java
MessageTool.java
Log:
switch to new module-sensitive StrutsUtils methods
Revision Changes Path
1.2 +2 -2 jakarta-velocity-tools/src/java/org/apache/velocity/tools/struts/ActionMessagesTool.java
Index: ActionMessagesTool.java
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/src/java/org/apache/velocity/tools/struts/ActionMessagesTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ActionMessagesTool.java 22 Jul 2003 06:09:22 -0000 1.1
+++ ActionMessagesTool.java 25 Jul 2003 16:54:40 -0000 1.2
@@ -125,7 +125,7 @@
ServletContext application = context.getServletContext();
this.locale = StrutsUtils.getLocale(request, session);
- this.resources = StrutsUtils.getMessageResources(application);
+ this.resources = StrutsUtils.getMessageResources(request, application);
this.actionMsgs = StrutsUtils.getActionMessages(request);
}
1.5 +4 -4 jakarta-velocity-tools/src/java/org/apache/velocity/tools/struts/ErrorsTool.java
Index: ErrorsTool.java
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/src/java/org/apache/velocity/tools/struts/ErrorsTool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ErrorsTool.java 28 May 2003 00:17:15 -0000 1.4
+++ ErrorsTool.java 25 Jul 2003 16:54:40 -0000 1.5
@@ -155,7 +155,7 @@
this.session = request.getSession(false);
this.application = context.getServletContext();
- resources = StrutsUtils.getMessageResources(application);
+ resources = StrutsUtils.getMessageResources(request, application);
locale = StrutsUtils.getLocale(request, session);
errors = StrutsUtils.getActionErrors(request);
}
@@ -174,7 +174,7 @@
return false;
}
- return !errors.empty();
+ return !errors.isEmpty();
}
@@ -271,7 +271,7 @@
*/
public ArrayList get(String property)
{
- if (errors == null || errors.empty())
+ if (errors == null || errors.isEmpty())
{
return null;
}
1.4 +2 -2 jakarta-velocity-tools/src/java/org/apache/velocity/tools/struts/MessageTool.java
Index: MessageTool.java
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/src/java/org/apache/velocity/tools/struts/MessageTool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MessageTool.java 28 May 2003 00:17:15 -0000 1.3
+++ MessageTool.java 25 Jul 2003 16:54:40 -0000 1.4
@@ -131,7 +131,7 @@
HttpSession session = request.getSession(false);
ServletContext application = context.getServletContext();
- this.resources = StrutsUtils.getMessageResources(application);
+ this.resources = StrutsUtils.getMessageResources(request, application);
this.locale = StrutsUtils.getLocale(request, session);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org