webwork/src/main/webwork/view/taglib BasicPropertyTag.java,1.8,1.9 IncludeTag.java,1.20,1.21 URLTag.java,1.24,1.25

Update of /cvsroot/opensymphony/webwork/src/main/webwork/view/taglib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20558/src/main/webwork/view/taglib

Modified Files:
	BasicPropertyTag.java IncludeTag.java URLTag.java 
Log Message:
Fixed a bunch of 1.5 related warnings

Index: BasicPropertyTag.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/view/taglib/BasicPropertyTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- BasicPropertyTag.java	28 Feb 2005 18:43:29 -0000	1.8
+++ BasicPropertyTag.java	19 Mar 2005 19:20:22 -0000	1.9
@@ -104,12 +104,12 @@
             //LogFactory.getLog(this.getClass()).debug("Property value:"+value);
             if (value != null && getId() == null)
                if (value instanceof Iterator) {
-                  Iterator enum = (Iterator) value;
-                  if (enum.hasNext()) {
+                  Iterator iter = (Iterator) value;
+                  if (iter.hasNext()) {
                      if (shouldEscape()) {
-                        pageContext.getOut().write(TextUtil.escapeHTML(BeanUtil.toStringValue(enum.next())));
+                        pageContext.getOut().write(TextUtil.escapeHTML(BeanUtil.toStringValue(iter.next())));
                      } else {
-                        pageContext.getOut().write(BeanUtil.toStringValue(enum.next()));
+                        pageContext.getOut().write(BeanUtil.toStringValue(iter.next()));
                      }
                   }
                } else if (value instanceof char[]) {

Index: IncludeTag.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/view/taglib/IncludeTag.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- IncludeTag.java	1 Nov 2003 20:10:09 -0000	1.20
+++ IncludeTag.java	19 Mar 2005 19:20:22 -0000	1.21
@@ -31,7 +31,7 @@
 /**
  * Include a servlets output (For example, result of servlet, or a JSP page).
  *
- * @author Rickard Öberg ([email protected])
+ * @author Rickard �berg ([email protected])
  * @author <a href="mailto:[email protected]">Scott Farquhar</a>
  * @version $Revision$
  */
@@ -238,10 +238,10 @@
             String concat = "";
 
             // Set parameters
-            Iterator enum = params.entrySet().iterator();
-            while (enum.hasNext())
+            Iterator iter = params.entrySet().iterator();
+            while (iter.hasNext())
             {
-                Map.Entry entry = (Map.Entry) enum.next();
+                Map.Entry entry = (Map.Entry) iter.next();
                 Object name = entry.getKey();
                 List values = (List) entry.getValue();
                 for (int i = 0; i < values.size(); i++)

Index: URLTag.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/view/taglib/URLTag.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- URLTag.java	28 Feb 2005 18:43:29 -0000	1.24
+++ URLTag.java	19 Mar 2005 19:20:29 -0000	1.25
@@ -175,9 +175,9 @@
          }
 
          // Set parameters
-         Iterator enum = params.entrySet().iterator();
-         while (enum.hasNext()) {
-            Map.Entry entry = (Map.Entry) enum.next();
+         Iterator iter = params.entrySet().iterator();
+         while (iter.hasNext()) {
+            Map.Entry entry = (Map.Entry) iter.next();
             String name = (String) entry.getKey();
             Object value = entry.getValue();
             if (value != null) {
@@ -201,7 +201,7 @@
                }
             }
 
-            if (enum.hasNext())
+            if (iter.hasNext())
                link.append("&amp;");
          }
       }



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click