Author: scolebourne Date: Sat Oct 28 10:49:04 2006 New Revision: 468709 URL: http://svn.apache.org/viewvc?view=rev&rev=468709 Log: Convert to generics
Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapIterator.java Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapIterator.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapIterator.java?view=diff&rev=468709&r1=468708&r2=468709 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapIterator.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapIterator.java Sat Oct 28 10:49:04 2006 @@ -45,8 +45,8 @@ * * @author Stephen Colebourne */ -public interface MapIterator extends Iterator { - +public interface MapIterator<K, V> extends Iterator<K> { + /** * Checks to see if there are more entries still to be iterated. * @@ -60,7 +60,7 @@ * @return the next key in the iteration * @throws java.util.NoSuchElementException if the iteration is finished */ - Object next(); + K next(); //----------------------------------------------------------------------- /** @@ -70,7 +70,7 @@ * @return the current key * @throws IllegalStateException if <code>next()</code> has not yet been called */ - Object getKey(); + K getKey(); /** * Gets the current value, which is the value associated with the last key @@ -79,7 +79,7 @@ * @return the current value * @throws IllegalStateException if <code>next()</code> has not yet been called */ - Object getValue(); + V getValue(); //----------------------------------------------------------------------- /** @@ -93,7 +93,7 @@ * since the last call to <code>next()</code> */ void remove(); - + /** * Sets the value associated with the current key (optional operation). * @@ -104,6 +104,6 @@ * @throws IllegalStateException if <code>remove()</code> has been called since the * last call to <code>next()</code> */ - Object setValue(Object value); + V setValue(V value); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]