luehe 2004/05/10 13:02:03
Modified: jasper2/src/share/org/apache/jasper/tagplugins/jstl
ForEach.java
Log:
Added support for 'items' of type java.util.Map
Revision Changes Path
1.9 +7 -0
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/tagplugins/jstl/ForEach.java
Index: ForEach.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/tagplugins/jstl/ForEach.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ForEach.java 10 May 2004 17:30:29 -0000 1.8
+++ ForEach.java 10 May 2004 20:02:03 -0000 1.9
@@ -135,10 +135,17 @@
ctxt.generateJavaSource("else if (" + itemsV + " instanceof double[])");
ctxt.generateJavaSource(iterV + "=toIterator((double[])" + itemsV + ");");
+ // Collection
ctxt.generateJavaSource("else if (" + itemsV + " instanceof Collection)");
ctxt.generateJavaSource(iterV + "=((Collection)" + itemsV +
").iterator();");
+
+ // Iterator
ctxt.generateJavaSource("else if (" + itemsV + " instanceof Iterator)");
ctxt.generateJavaSource(iterV + "=(Iterator)" + itemsV + ";");
+
+ // Map
+ ctxt.generateJavaSource("else if (" + itemsV + " instanceof Map)");
+ ctxt.generateJavaSource(iterV + "=((Map)" + itemsV +
").entrySet().iterator();");
if (hasBegin) {
String tV = ctxt.getTemporaryVariableName();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
