You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by dg...@apache.org on 2003/07/31 01:55:50 UTC
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html MessagesTag.java
dgraham 2003/07/30 16:55:50
Modified: src/share/org/apache/struts/util RequestUtils.java
src/share/org/apache/struts/taglib/logic
MessagesPresentTag.java
src/share/org/apache/struts/taglib TagUtils.java
src/share/org/apache/struts/taglib/html MessagesTag.java
Log:
Moved getActionMessages() to TagUtils.
Revision Changes Path
1.129 +9 -35 jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- RequestUtils.java 27 Jul 2003 06:27:19 -0000 1.128
+++ RequestUtils.java 30 Jul 2003 23:55:50 -0000 1.129
@@ -70,14 +70,12 @@
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
@@ -90,7 +88,6 @@
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.action.ActionServlet;
import org.apache.struts.action.ActionServletWrapper;
@@ -1475,37 +1472,14 @@
* @param pageContext The PageContext for the current page
* @param paramName Key for parameter value
* @return ActionErros in page context.
- * @throws JspException if
+ * @throws JspException
+ * @deprecated Use TagUtils.getActionMessages() instead. This will be
+ * removed after Struts 1.2.
*/
public static ActionMessages getActionMessages(PageContext pageContext, String paramName)
throws JspException {
-
- ActionMessages am = new ActionMessages();
-
- Object value = pageContext.findAttribute(paramName);
-
- try {
- if (value == null) {
- ;
- } else if (value instanceof String) {
- am.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage((String) value));
- } else if (value instanceof String[]) {
- String keys[] = (String[]) value;
- for (int i = 0; i < keys.length; i++)
- am.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(keys[i]));
- } else if (value instanceof ActionMessages) {
- am = (ActionMessages) value;
- } else {
- throw new JspException(
- messages.getMessage("actionMessages.errors", value.getClass().getName()));
- }
- } catch (JspException e) {
- throw e;
- } catch (Exception e) {
- ;
- }
-
- return am;
+
+ return TagUtils.getInstance().getActionMessages(pageContext,paramName);
}
/**
1.9 +4 -4 jakarta-struts/src/share/org/apache/struts/taglib/logic/MessagesPresentTag.java
Index: MessagesPresentTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/MessagesPresentTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MessagesPresentTag.java 26 Jul 2003 01:00:01 -0000 1.8
+++ MessagesPresentTag.java 30 Jul 2003 23:55:50 -0000 1.9
@@ -62,7 +62,6 @@
import org.apache.struts.Globals;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.taglib.TagUtils;
-import org.apache.struts.util.RequestUtils;
/**
* Evalute to <code>true</code> if an <code>ActionMessages</code> class or a
@@ -132,10 +131,11 @@
if (Globals.ERROR_KEY.equals(name)) {
am = TagUtils.getInstance().getActionErrors(pageContext, name);
} else {
- am = RequestUtils.getActionMessages(pageContext, name);
+ am = TagUtils.getInstance().getActionMessages(pageContext, name);
}
+
} catch (JspException e) {
- RequestUtils.saveException(pageContext, e);
+ TagUtils.getInstance().saveException(pageContext, e);
throw e;
}
1.15 +59 -12 jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java
Index: TagUtils.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TagUtils.java 27 Jul 2003 06:25:41 -0000 1.14
+++ TagUtils.java 30 Jul 2003 23:55:50 -0000 1.15
@@ -61,30 +61,32 @@
package org.apache.struts.taglib;
+import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
-import java.util.Iterator;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.struts.Globals;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
-import org.apache.struts.config.ModuleConfig;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
import org.apache.struts.config.ForwardConfig;
+import org.apache.struts.config.ModuleConfig;
+import org.apache.struts.taglib.html.Constants;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.RequestUtils;
-import org.apache.struts.Globals;
-import org.apache.struts.taglib.html.Constants;
/**
* Provides helper methods for JSP tags.
@@ -660,6 +662,51 @@
}
return value.toString();
+ }
+
+ /**
+ * Retrieves the value from request scope and if it isn't already an
+ * <code>ActionMessages</code>, some classes are converted to one.
+ *
+ * @param pageContext The PageContext for the current page
+ * @param paramName Key for parameter value
+ * @return ActionErrors in page context.
+ * @throws JspException
+ */
+ public ActionMessages getActionMessages(PageContext pageContext, String paramName)
+ throws JspException {
+
+ ActionMessages am = new ActionMessages();
+
+ Object value = pageContext.findAttribute(paramName);
+
+ try {
+ if (value == null) {
+ ;
+ } else if (value instanceof String) {
+ am.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage((String) value));
+
+ } else if (value instanceof String[]) {
+ String keys[] = (String[]) value;
+ for (int i = 0; i < keys.length; i++){
+ am.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(keys[i]));
+ }
+
+ } else if (value instanceof ActionMessages) {
+ am = (ActionMessages) value;
+
+ } else {
+ throw new JspException(
+ messages.getMessage("actionMessages.errors", value.getClass().getName()));
+ }
+
+ } catch (JspException e) {
+ throw e;
+ } catch (Exception e) {
+ ;
+ }
+
+ return am;
}
/**
1.19 +6 -6 jakarta-struts/src/share/org/apache/struts/taglib/html/MessagesTag.java
Index: MessagesTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MessagesTag.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- MessagesTag.java 27 Jul 2003 07:13:04 -0000 1.18
+++ MessagesTag.java 30 Jul 2003 23:55:50 -0000 1.19
@@ -72,7 +72,6 @@
import org.apache.struts.action.ActionMessages;
import org.apache.struts.taglib.TagUtils;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ResponseUtils;
/**
@@ -237,7 +236,8 @@
}
try {
- messages = RequestUtils.getActionMessages(pageContext, name);
+ messages = TagUtils.getInstance().getActionMessages(pageContext, name);
+
} catch (JspException e) {
TagUtils.getInstance().saveException(pageContext, e);
throw e;
---------------------------------------------------------------------
To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: struts-dev-help@jakarta.apache.org