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 2005/10/15 04:10:53 UTC
svn commit: r321277 - in
/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts:
ActionMessagesTool.java StrutsUtils.java
Author: nbubna
Date: Fri Oct 14 19:10:50 2005
New Revision: 321277
URL: http://svn.apache.org/viewcvs?rev=321277&view=rev
Log:
add support for non-resource ActionMessages (patch by Niall Pemberton, Issue VELTOOLS-51)
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ActionMessagesTool.java
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/StrutsUtils.java
Modified: jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ActionMessagesTool.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ActionMessagesTool.java?rev=321277&r1=321276&r2=321277&view=diff
==============================================================================
--- jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ActionMessagesTool.java (original)
+++ jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/ActionMessagesTool.java Fri Oct 14 19:10:50 2005
@@ -248,7 +248,7 @@
ActionMessage msg = (ActionMessage)msgs.next();
String message = null;
- if (res != null)
+ if (res != null && msg.isResource())
{
message =
res.getMessage(this.locale, msg.getKey(), msg.getValues());
@@ -262,7 +262,8 @@
if (message == null)
{
- // if the resource bundle wasn't found or the key
+ // if the resource bundle wasn't found or
+ // ActionMessage.isResource() returned false or the key
// wasn't found in the resources, then use the key
message = msg.getKey();
}
Modified: jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/StrutsUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/StrutsUtils.java?rev=321277&r1=321276&r2=321277&view=diff
==============================================================================
--- jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/StrutsUtils.java (original)
+++ jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/StrutsUtils.java Fri Oct 14 19:10:50 2005
@@ -532,7 +532,7 @@
{
message = null;
ActionMessage report = (ActionMessage)reports.next();
- if (resources != null)
+ if (resources != null && report.isResource())
{
message = resources.getMessage(locale,
report.getKey(),
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org