From 47518afaad9774ff8891141fae6d52abb5b265a4 Mon Sep 17 00:00:00 2001 From: Henri Yandell Date: Tue, 15 Sep 2009 05:55:30 +0000 Subject: [PATCH] Merging from -r468106:814127 of collections_jdk5_branch - namely where this code was generified; mostly in r738956. Also see the following revisions: ------------------------------------------------------------------------ r555925 | skestle | 2007-07-13 03:39:24 -0700 (Fri, 13 Jul 2007) | 2 lines Added Edwin Tellman's patch for COLLECTIONS-243. It all seems pretty reasonable, and it should all be checked again as the project is worked through ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@815059 13f79535-47bb-0310-9956-ffa450edef68 --- .../iterators/AbstractListIteratorDecorator.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java b/src/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java index c61658a4c..90332dc31 100644 --- a/src/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java +++ b/src/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java @@ -29,10 +29,10 @@ import java.util.ListIterator; * @author Rodney Waldhoff * @author Stephen Colebourne */ -public class AbstractListIteratorDecorator implements ListIterator { +public class AbstractListIteratorDecorator implements ListIterator { /** The iterator being decorated */ - protected final ListIterator iterator; + protected final ListIterator iterator; //----------------------------------------------------------------------- /** @@ -41,7 +41,7 @@ public class AbstractListIteratorDecorator implements ListIterator { * @param iterator the iterator to decorate, must not be null * @throws IllegalArgumentException if the collection is null */ - public AbstractListIteratorDecorator(ListIterator iterator) { + public AbstractListIteratorDecorator(ListIterator iterator) { super(); if (iterator == null) { throw new IllegalArgumentException("ListIterator must not be null"); @@ -54,7 +54,7 @@ public class AbstractListIteratorDecorator implements ListIterator { * * @return the decorated iterator */ - protected ListIterator getListIterator() { + protected ListIterator getListIterator() { return iterator; } @@ -63,7 +63,7 @@ public class AbstractListIteratorDecorator implements ListIterator { return iterator.hasNext(); } - public Object next() { + public E next() { return iterator.next(); } @@ -75,7 +75,7 @@ public class AbstractListIteratorDecorator implements ListIterator { return iterator.hasPrevious(); } - public Object previous() { + public E previous() { return iterator.previous(); } @@ -87,11 +87,11 @@ public class AbstractListIteratorDecorator implements ListIterator { iterator.remove(); } - public void set(Object obj) { + public void set(E obj) { iterator.set(obj); } - public void add(Object obj) { + public void add(E obj) { iterator.add(obj); }