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 2004/02/12 00:56:40 UTC
cvs commit: jakarta-velocity-tools/src/java/org/apache/velocity/tools/struts StrutsUtils.java
nbubna 2004/02/11 15:56:40
Modified: src/java/org/apache/velocity/tools/struts StrutsUtils.java
Log:
ActionError is an empty extension of ActionMessage
Revision Changes Path
1.14 +4 -3 jakarta-velocity-tools/src/java/org/apache/velocity/tools/struts/StrutsUtils.java
Index: StrutsUtils.java
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/src/java/org/apache/velocity/tools/struts/StrutsUtils.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StrutsUtils.java 6 Nov 2003 17:30:32 -0000 1.13
+++ StrutsUtils.java 11 Feb 2004 23:56:40 -0000 1.14
@@ -69,8 +69,8 @@
import org.apache.struts.Globals;
import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.config.ForwardConfig;
@@ -605,6 +605,7 @@
String forward)
{
ModuleConfig moduleConfig = RequestUtils.getModuleConfig(request, app);
+ //TODO? beware of null module config if ActionServlet isn't init'ed?
ForwardConfig fc = moduleConfig.findForwardConfig(forward);
if (fc == null)
{
@@ -722,7 +723,7 @@
while (reports.hasNext())
{
message = null;
- ActionError report = (ActionError)reports.next();
+ ActionMessage report = (ActionMessage)reports.next();
if (resources != null)
{
message = resources.getMessage(locale,
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org