Author: martinc Date: Sat Dec 11 20:03:49 2004 New Revision: 111630 URL: http://svn.apache.org/viewcvs?view=rev&rev=111630 Log: enum is a keyword in Java 5. Modified: struts/core/trunk/src/share/org/apache/struts/util/IteratorAdapter.java
Modified: struts/core/trunk/src/share/org/apache/struts/util/IteratorAdapter.java Url: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/IteratorAdapter.java?view=diff&rev=111630&p1=struts/core/trunk/src/share/org/apache/struts/util/IteratorAdapter.java&r1=111629&p2=struts/core/trunk/src/share/org/apache/struts/util/IteratorAdapter.java&r2=111630 ============================================================================== --- struts/core/trunk/src/share/org/apache/struts/util/IteratorAdapter.java (original) +++ struts/core/trunk/src/share/org/apache/struts/util/IteratorAdapter.java Sat Dec 11 20:03:49 2004 @@ -18,6 +18,7 @@ package org.apache.struts.util; +import java.util.Enumeration; import java.util.Iterator; import java.util.NoSuchElementException; @@ -32,23 +33,23 @@ */ public class IteratorAdapter implements Iterator { - private java.util.Enumeration enum; + private Enumeration e; - public IteratorAdapter(java.util.Enumeration enum) { - this.enum = enum; + public IteratorAdapter(Enumeration e) { + this.e = e; } public boolean hasNext() { - return enum.hasMoreElements(); + return e.hasMoreElements(); } public Object next() { - if (!enum.hasMoreElements()) { + if (!e.hasMoreElements()) { throw new NoSuchElementException("IteratorAdaptor.next() has no more elements"); } - return enum.nextElement(); + return e.nextElement(); } public void remove() { - throw new java.lang.UnsupportedOperationException("Method IteratorAdaptor.remove() not implemented"); + throw new UnsupportedOperationException("Method IteratorAdaptor.remove() not implemented"); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
