[cvs] expresso commit by ppilgrim: Struts upgrade 1.2.6 remove pending

[JCorporate Ltd]

Log Message:
-----------
Struts upgrade 1.2.6 remove pending deprecations with recommended
replacements for ActionError with ActionMessage
http://wiki.apache.org/struts/StrutsUpgradeNotes11to124

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller:
        ErrorCollection.java

Revision Data
-------------
Index: ErrorCollection.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ErrorCollection.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ErrorCollection.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ErrorCollection.java -u -r1.20 -r1.21
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ErrorCollection.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ErrorCollection.java
@@ -64,13 +64,15 @@
 
 package com.jcorporate.expresso.core.controller;
 
-import com.jcorporate.expresso.kernel.exception.ChainedException;
+import java.io.Serializable;
+import java.util.Iterator;
+
 import org.apache.struts.Globals;
-import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
 
-import java.io.Serializable;
-import java.util.Iterator;
+import com.jcorporate.expresso.kernel.exception.ChainedException;
 
 /**
  * An ErrorCollection is the Controller-specific ActionErrors collection for Expresso
@@ -100,7 +102,7 @@
      */
     public void addError(String errorMessage) {
         if (!hasErrorMessage(errorMessage)) {
-            add(ActionErrors.GLOBAL_ERROR, new ActionMessage(errorMessage));
+            add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(errorMessage));
         }
     } /* addError(String) */
 
@@ -113,7 +115,7 @@
      */
     public void addError(String errorMessage, Object errorMessageParam1) {
         if (!hasErrorMessage(errorMessage)) {
-            add(ActionErrors.GLOBAL_ERROR, new ActionMessage(errorMessage, errorMessageParam1));
+            add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(errorMessage, errorMessageParam1));
         }
     } /* addError(String) */
 
@@ -128,7 +130,7 @@
      */
     public void addError(String errorMessage, Object errorMessageParam1, Object errorMessageParam2) {
         if (!hasErrorMessage(errorMessage)) {
-            add(ActionErrors.GLOBAL_ERROR, new ActionMessage(errorMessage, errorMessageParam1, errorMessageParam2));
+            add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(errorMessage, errorMessageParam1, errorMessageParam2));
         }
     } /* addError(String) */
 
@@ -147,7 +149,7 @@
                          Object errorMessageParam2,
                          Object errorMessageParam3) {
         if (!hasErrorMessage(errorMessage)) {
-            add(ActionErrors.GLOBAL_ERROR,
+            add(ActionMessages.GLOBAL_MESSAGE,
                     new ActionMessage(errorMessage, errorMessageParam1, errorMessageParam2, errorMessageParam3));
         }
     } /* addError(String) */
@@ -159,7 +161,7 @@
      */
     public void addError(String errorMessage, Object[] args) {
         if (!hasErrorMessage(errorMessage)) {
-            add(ActionErrors.GLOBAL_ERROR, new ActionMessage(errorMessage, args));
+            add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(errorMessage, args));
         }
     } /* addError(String) */