dgraham 2003/08/22 17:22:12 Modified: src/share/org/apache/struts/taglib/html ErrorsTag.java src/share/org/apache/struts/taglib/logic MessagesPresentTag.java src/share/org/apache/struts/taglib TagUtils.java Log: Deprecated TagUtils.getActionErrors() in favor of TagUtils.getActionMessages() which now handles ActionErrors objects. Revision Changes Path 1.30 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/html/ErrorsTag.java Index: ErrorsTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ErrorsTag.java,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ErrorsTag.java 19 Aug 2003 23:36:54 -0000 1.29 +++ ErrorsTag.java 23 Aug 2003 00:22:12 -0000 1.30 @@ -183,7 +183,7 @@ // Were any error messages specified? ActionMessages errors = null; try { - errors = TagUtils.getInstance().getActionErrors(pageContext, name); + errors = TagUtils.getInstance().getActionMessages(pageContext, name); } catch (JspException e) { TagUtils.getInstance().saveException(pageContext, e); throw e; 1.10 +2 -7 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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- MessagesPresentTag.java 30 Jul 2003 23:55:50 -0000 1.9 +++ MessagesPresentTag.java 23 Aug 2003 00:22:12 -0000 1.10 @@ -127,12 +127,7 @@ } try { - // Definitely know it should be an error so use method to retrieve errors. - if (Globals.ERROR_KEY.equals(name)) { - am = TagUtils.getInstance().getActionErrors(pageContext, name); - } else { - am = TagUtils.getInstance().getActionMessages(pageContext, name); - } + am = TagUtils.getInstance().getActionMessages(pageContext, name); } catch (JspException e) { TagUtils.getInstance().saveException(pageContext, e); 1.25 +26 -10 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.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- TagUtils.java 23 Aug 2003 00:12:40 -0000 1.24 +++ TagUtils.java 23 Aug 2003 00:22:12 -0000 1.25 @@ -629,6 +629,8 @@ * @param paramName Key for parameter value * @return ActionErrors from request scope * @exception JspException + * @deprecated Use getActionMessages() instead. This will be removed + * after Struts 1.2. */ public ActionErrors getActionErrors(PageContext pageContext, String paramName) throws JspException { @@ -649,7 +651,9 @@ } else if (value instanceof String[]) { String keys[] = (String[]) value; for (int i = 0; i < keys.length; i++) { - errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(keys[i])); + errors.add( + ActionMessages.GLOBAL_MESSAGE, + new ActionMessage(keys[i])); } } else if (value instanceof ActionErrors) { @@ -766,7 +770,9 @@ * @return ActionErrors in page context. * @throws JspException */ - public ActionMessages getActionMessages(PageContext pageContext, String paramName) + public ActionMessages getActionMessages( + PageContext pageContext, + String paramName) throws JspException { ActionMessages am = new ActionMessages(); @@ -777,20 +783,30 @@ if (value == null) { ; } else if (value instanceof String) { - am.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage((String) value)); + 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])); + am.add( + ActionMessages.GLOBAL_MESSAGE, + new ActionMessage(keys[i])); } - + + } else if (value instanceof ActionErrors) { + ActionMessages m = (ActionMessages) value; + am.add(m); + } else if (value instanceof ActionMessages) { am = (ActionMessages) value; } else { throw new JspException( - messages.getMessage("actionMessages.errors", value.getClass().getName())); + messages.getMessage( + "actionMessages.errors", + value.getClass().getName())); } } catch (JspException e) {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]