dgraham 2003/08/23 10:04:46
Modified: src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel
RssChannelsAction.java Channels.java
src/example/org/apache/struts/webapp/example
SaveRegistrationAction.java LogonAction.java
src/share/org/apache/struts/action Action.java
Log:
Deprecated Action.saveErrors(HttpServletRequest, ActionErrors) and
replaced it with Action.saveErrors(HttpServletRequest, ActionMessages).
Revision Changes Path
1.8 +7 -7
jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java
Index: RssChannelsAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RssChannelsAction.java 23 Aug 2003 00:12:39 -0000 1.7
+++ RssChannelsAction.java 23 Aug 2003 17:04:46 -0000 1.8
@@ -71,7 +71,6 @@
import org.apache.commons.digester.rss.RSSDigester;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -142,7 +141,7 @@
log.debug("Enter Rss Channel Action");
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
// -- Retrieve parameters --
// Urls can come from a list, or from a single attribute.
@@ -175,6 +174,7 @@
channelBeans.add(obj);
}
+
} catch (Throwable t) {
errors.add(
ActionMessages.GLOBAL_MESSAGE,
@@ -185,7 +185,7 @@
// -- Handle Errors ---
if (!errors.isEmpty()) {
- saveErrors(request, errors);
+ this.saveErrors(request, errors);
// If no input page, use error forwarding
log.debug("Exit Rss Channel Action : error");
1.8 +7 -8
jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/Channels.java
Index: Channels.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/Channels.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Channels.java 23 Aug 2003 00:12:39 -0000 1.7
+++ Channels.java 23 Aug 2003 17:04:46 -0000 1.8
@@ -73,7 +73,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -131,7 +130,7 @@
throw new ServletException("This action must be called by a Tile, not
directly");
}
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
// -- Retrieve parameters --
// Urls can come from a list, or from a single attribute.
@@ -174,7 +173,7 @@
// -- Handle Errors ---
if (!errors.isEmpty()) {
- saveErrors(request, errors);
+ this.saveErrors(request, errors);
if (mapping.getInput() != null) {
return new ActionForward(mapping.getInput());
@@ -184,7 +183,7 @@
log.debug("Exit Rss Channel Action : error");
- return (mapping.findForward("error"));
+ return mapping.findForward("error");
}
// -- Save Bean, and Continue ---
1.17 +9 -8
jakarta-struts/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java
Index: SaveRegistrationAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SaveRegistrationAction.java 23 Aug 2003 00:12:39 -0000 1.16
+++ SaveRegistrationAction.java 23 Aug 2003 17:04:46 -0000 1.17
@@ -72,7 +72,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -156,7 +155,7 @@
}
// Validate the transactional control token
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
if (log.isTraceEnabled()) {
log.trace(" Checking transactional control token");
}
@@ -199,8 +198,8 @@
// Report any errors we have discovered back to the original form
if (!errors.isEmpty()) {
- saveErrors(request, errors);
- saveToken(request);
+ this.saveErrors(request, errors);
+ this.saveToken(request);
return (mapping.getInputForward());
}
@@ -223,8 +222,10 @@
if (t == null) {
t = e;
}
+
log.error("Registration.populate", t);
throw new ServletException("Registration.populate", t);
+
} catch (Throwable t) {
log.error("Registration.populate", t);
throw new ServletException("Subscription.populate", t);
1.17 +6 -7
jakarta-struts/src/example/org/apache/struts/webapp/example/LogonAction.java
Index: LogonAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LogonAction.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- LogonAction.java 23 Aug 2003 00:12:39 -0000 1.16
+++ LogonAction.java 23 Aug 2003 17:04:46 -0000 1.17
@@ -69,7 +69,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -119,7 +118,7 @@
User user = null;
// Validate the request parameters specified by the user
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
String username = (String) PropertyUtils.getSimpleProperty(form,
"username");
String password = (String) PropertyUtils.getSimpleProperty(form,
"password");
UserDatabase database =
@@ -146,7 +145,7 @@
// Report any errors we have discovered back to the original form
if (!errors.isEmpty()) {
- saveErrors(request, errors);
+ this.saveErrors(request, errors);
return (mapping.getInputForward());
}
1.68 +20 -4 jakarta-struts/src/share/org/apache/struts/action/Action.java
Index: Action.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- Action.java 19 Aug 2003 23:20:45 -0000 1.67
+++ Action.java 23 Aug 2003 17:04:46 -0000 1.68
@@ -417,8 +417,24 @@
*
* @param request The servlet request we are processing
* @param errors Error messages object
+ * @deprecated Use saveErrors(HttpServletRequest, ActionMessages) instead.
+ * This will be removed after Struts 1.2.
*/
protected void saveErrors(HttpServletRequest request, ActionErrors errors) {
+ this.saveErrors(request, errors);
+ }
+
+ /**
+ * Save the specified error messages keys into the appropriate request
+ * attribute for use by the <html:errors> tag, if any messages
+ * are required. Otherwise, ensure that the request attribute is not
+ * created.
+ *
+ * @param request The servlet request we are processing
+ * @param errors Error messages object
+ * @since Struts 1.2
+ */
+ protected void saveErrors(HttpServletRequest request, ActionMessages errors) {
// Remove any error messages attribute if none are required
if ((errors == null) || errors.isEmpty()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
