svn commit: r664435 - in /struts/struts1/trunk/taglib/src/main: java/org/apache/struts/taglib/logic/IterateTag.java resources/org/apache/struts/taglib/logic/LocalStrings.properties resources/org/apache/struts/taglib/logic/LocalStrings_es.properties

[pb...@apache.org]

Author: pbenedict
Date: Sat Jun  7 21:14:46 2008
New Revision: 664435

URL: http://svn.apache.org/viewvc?rev=664435&view=rev
Log:
STR-2153: Reveal the offending bean and property name when iterating

Modified:
    struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTag.java
    struts/struts1/trunk/taglib/src/main/resources/org/apache/struts/taglib/logic/LocalStrings.properties
    struts/struts1/trunk/taglib/src/main/resources/org/apache/struts/taglib/logic/LocalStrings_es.properties

Modified: struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTag.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTag.java?rev=664435&r1=664434&r2=664435&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTag.java (original)
+++ struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTag.java Sat Jun  7 21:14:46 2008
@@ -240,7 +240,8 @@
 
         if (collection == null) {
             JspException e =
-                new JspException(messages.getMessage("iterate.collection"));
+                new JspException(messages.getMessage("iterate.collection", 
+                		name, property));
 
             TagUtils.getInstance().saveException(pageContext, e);
             throw e;
@@ -273,7 +274,8 @@
             iterator = new IteratorAdapter((Enumeration) collection);
         } else {
             JspException e =
-                new JspException(messages.getMessage("iterate.iterator"));
+                new JspException(messages.getMessage("iterate.iterator", name, 
+                		property, collection.getClass().getName()));
 
             TagUtils.getInstance().saveException(pageContext, e);
             throw e;

Modified: struts/struts1/trunk/taglib/src/main/resources/org/apache/struts/taglib/logic/LocalStrings.properties
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/resources/org/apache/struts/taglib/logic/LocalStrings.properties?rev=664435&r1=664434&r2=664435&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/main/resources/org/apache/struts/taglib/logic/LocalStrings.properties (original)
+++ struts/struts1/trunk/taglib/src/main/resources/org/apache/struts/taglib/logic/LocalStrings.properties Sat Jun  7 21:14:46 2008
@@ -17,8 +17,8 @@
 forward.forward=Exception forwarding for name {0}: {1}
 forward.lookup=Cannot find global ActionForward for name {0}
 forward.redirect=Exception redirecting for name {0}: {1}
-iterate.collection=No collection found
-iterate.iterator=Cannot create iterator for this collection
+iterate.collection=No collection found for name {0} property {1}
+iterate.iterator=Cannot create iterator for collection name {0} property {1}: {2}
 logic.bean=No bean found under attribute key {0}
 logic.property=Exception accessing property {1} for bean {0}: {2}
 logic.selector=No selector attribute (cookie/header/name/parameter) was specified

Modified: struts/struts1/trunk/taglib/src/main/resources/org/apache/struts/taglib/logic/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/resources/org/apache/struts/taglib/logic/LocalStrings_es.properties?rev=664435&r1=664434&r2=664435&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/main/resources/org/apache/struts/taglib/logic/LocalStrings_es.properties (original)
+++ struts/struts1/trunk/taglib/src/main/resources/org/apache/struts/taglib/logic/LocalStrings_es.properties Sat Jun  7 21:14:46 2008
@@ -17,8 +17,8 @@
 forward.forward=Excepción reenviando para nombre {0}: {1}
 forward.lookup=No puedo hallar ActionForward global para nombre {0}
 forward.redirect=Excepción redirigiendo para nombre {0}: {1}
-iterate.collection=No se ha hallado la colección
-iterate.iterator=No puedo crear iterator para esta colección
+iterate.collection=No se ha hallado la colección para nombre {0} propiedad {1}
+iterate.iterator=No puedo crear iterator para esta colección para nombre {0} propiedad {1}: {2}
 logic.bean=No se ha hallado bean bajo clave de atributo {0}
 logic.property=Excepción accediendo a propiedad {1} para bean {0}: {2}
 logic.selector=No se ha especificado atributo de selector (cookie/header/name/parameter)