sraeburn 2003/07/25 00:26:53 Modified: src/share/org/apache/struts/util RequestUtils.java Removed: src/share/org/apache/struts/util ErrorMessages.java Log: Remove deprecated ErrorMessages Revision Changes Path 1.111 +4 -20 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.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- RequestUtils.java 16 Jul 2003 05:10:37 -0000 1.110 +++ RequestUtils.java 25 Jul 2003 07:26:53 -0000 1.111 @@ -1874,14 +1874,6 @@ 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 ErrorMessages) { - String keys[] = ((ErrorMessages) value).getErrors(); - if (keys == null) { - keys = new String[0]; - } - for (int i = 0; i < keys.length; i++) { - am.add(ActionErrors.GLOBAL_ERROR, new ActionError(keys[i])); - } } else if (value instanceof ActionMessages) { am = (ActionMessages) value; } else { @@ -1920,14 +1912,6 @@ errors.add(ActionErrors.GLOBAL_ERROR, new ActionError((String) value)); } else if (value instanceof String[]) { String keys[] = (String[]) value; - for (int i = 0; i < keys.length; i++) { - errors.add(ActionErrors.GLOBAL_ERROR, new ActionError(keys[i])); - } - } else if (value instanceof ErrorMessages) { - String keys[] = ((ErrorMessages) value).getErrors(); - if (keys == null) { - keys = new String[0]; - } for (int i = 0; i < keys.length; i++) { errors.add(ActionErrors.GLOBAL_ERROR, new ActionError(keys[i])); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]