webwork/src/main/webwork/util IteratorFilterSupport.java,1.9,1.10 MakeIterator.java,1.3,1.4

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

Modified Files:
	IteratorFilterSupport.java MakeIterator.java 
Log Message:
Fixed a bunch of 1.5 related warnings

Index: IteratorFilterSupport.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/util/IteratorFilterSupport.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- IteratorFilterSupport.java	1 Nov 2003 06:38:23 -0000	1.9
+++ IteratorFilterSupport.java	19 Mar 2005 19:20:22 -0000	1.10
@@ -12,7 +12,7 @@
 /**
  *	A base class for iterator filters
  *
- *	@author Rickard Öberg ([email protected])
+ *	@author Rickard �berg ([email protected])
  *	@version $Revision$
  */
 public abstract class IteratorFilterSupport
@@ -27,21 +27,21 @@
    public class EnumerationIterator
       implements Iterator
    {
-      Enumeration enum;
+      Enumeration e;
 
       public EnumerationIterator(Enumeration aEnum)
       {
-         enum = aEnum;
+         e = aEnum;
       }
 
       public boolean hasNext()
       {
-         return enum.hasMoreElements();
+         return e.hasMoreElements();
       }
 
       public Object next()
       {
-         return enum.nextElement();
+         return e.nextElement();
       }
 
       public void remove()

Index: MakeIterator.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/util/MakeIterator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MakeIterator.java	7 Aug 2002 07:12:42 -0000	1.3
+++ MakeIterator.java	19 Mar 2005 19:20:22 -0000	1.4
@@ -26,7 +26,7 @@
          {
             //need ability to support primitives; therefore, cannot
             //use Object[] casting.
-            Object a = Array.newInstance(value.getClass().getComponentType(), (Array.getLength(value)));
+            //Object a = Array.newInstance(value.getClass().getComponentType(), (Array.getLength(value)));
             ArrayList list = new ArrayList(Array.getLength(value));
             for(int j = 0; j < Array.getLength(value); j++) {
                list.add(Array.get(value, j));
@@ -35,11 +35,11 @@
          }
          else if(value instanceof Enumeration)
          {
-            Enumeration enum = (Enumeration)value;
+            Enumeration e = (Enumeration)value;
             ArrayList list = new ArrayList();
-            while(enum.hasMoreElements())
+            while(e.hasMoreElements())
             {
-               list.add(enum.nextElement());
+               list.add(e.nextElement());
             }
             iterator = list.iterator();
          }



-------------------------------------------------------
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