http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java index 00d20c0..ceac2e9 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java @@ -78,6 +78,7 @@ public class EnumerationIterator<E> implements Iterator<E> { * @return true if the underlying enumeration has more elements * @throws NullPointerException if the underlying enumeration is null */ + @Override public boolean hasNext() { return enumeration.hasMoreElements(); } @@ -88,6 +89,7 @@ public class EnumerationIterator<E> implements Iterator<E> { * @return the next object from the enumeration * @throws NullPointerException if the enumeration is null */ + @Override public E next() { last = enumeration.nextElement(); return last; @@ -103,6 +105,7 @@ public class EnumerationIterator<E> implements Iterator<E> { * @exception IllegalStateException <code>next()</code> not called. * @exception UnsupportedOperationException if no associated collection */ + @Override public void remove() { if (collection != null) { if (last != null) {
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java b/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java index 53aa08a..1769557 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java @@ -82,6 +82,7 @@ public class FilterIterator<E> implements Iterator<E> { * @return true if there is another object that matches the predicate * @throws NullPointerException if either the iterator or predicate are null */ + @Override public boolean hasNext() { return nextObjectSet || setNextObject(); } @@ -94,6 +95,7 @@ public class FilterIterator<E> implements Iterator<E> { * @throws NoSuchElementException if there are no more elements that * match the predicate */ + @Override public E next() { if (!nextObjectSet) { if (!setNextObject()) { @@ -115,6 +117,7 @@ public class FilterIterator<E> implements Iterator<E> { * @throws IllegalStateException if <code>hasNext()</code> has already * been called. */ + @Override public void remove() { if (nextObjectSet) { throw new IllegalStateException("remove() cannot be called"); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java index 7e5855f..6bd0e43 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java @@ -113,18 +113,22 @@ public class FilterListIterator<E> implements ListIterator<E> { //----------------------------------------------------------------------- /** Not supported. */ + @Override public void add(final E o) { throw new UnsupportedOperationException("FilterListIterator.add(Object) is not supported."); } + @Override public boolean hasNext() { return nextObjectSet || setNextObject(); } + @Override public boolean hasPrevious() { return previousObjectSet || setPreviousObject(); } + @Override public E next() { if (!nextObjectSet) { if (!setNextObject()) { @@ -137,10 +141,12 @@ public class FilterListIterator<E> implements ListIterator<E> { return temp; } + @Override public int nextIndex() { return nextIndex; } + @Override public E previous() { if (!previousObjectSet) { if (!setPreviousObject()) { @@ -153,16 +159,19 @@ public class FilterListIterator<E> implements ListIterator<E> { return temp; } + @Override public int previousIndex() { return nextIndex-1; } /** Not supported. */ + @Override public void remove() { throw new UnsupportedOperationException("FilterListIterator.remove() is not supported."); } /** Not supported. */ + @Override public void set(final E o) { throw new UnsupportedOperationException("FilterListIterator.set(Object) is not supported."); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java b/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java index c703f07..2f86245 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java +++ b/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java @@ -231,6 +231,7 @@ public class IteratorChain<E> implements Iterator<E> { * * @return true if elements remain */ + @Override public boolean hasNext() { lockChain(); updateCurrentIterator(); @@ -246,6 +247,7 @@ public class IteratorChain<E> implements Iterator<E> { * @throws java.util.NoSuchElementException if all the Iterators are * exhausted */ + @Override public E next() { lockChain(); updateCurrentIterator(); @@ -267,6 +269,7 @@ public class IteratorChain<E> implements Iterator<E> { * or the remove method has already been called after the last call to the * next method. */ + @Override public void remove() { lockChain(); if (currentIterator == null) { http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java b/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java index b098346..5ee573b 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java +++ b/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java @@ -56,6 +56,7 @@ public class IteratorEnumeration<E> implements Enumeration<E> { * * @return true if the underlying iterator has more elements */ + @Override public boolean hasMoreElements() { return iterator.hasNext(); } @@ -67,6 +68,7 @@ public class IteratorEnumeration<E> implements Enumeration<E> { * @throws java.util.NoSuchElementException if the underlying iterator has * no more elements */ + @Override public E nextElement() { return iterator.next(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java b/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java index 7212002..be1261b 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java +++ b/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java @@ -68,14 +68,17 @@ public class IteratorIterable<E> implements Iterable<E> { */ private static <E> Iterator<E> createTypesafeIterator(final Iterator<? extends E> iterator) { return new Iterator<E>() { + @Override public boolean hasNext() { return iterator.hasNext(); } + @Override public E next() { return iterator.next(); } + @Override public void remove() { iterator.remove(); } @@ -120,6 +123,7 @@ public class IteratorIterable<E> implements Iterable<E> { * * @return the iterator */ + @Override public Iterator<E> iterator() { if (iterator instanceof ResettableIterator) { ((ResettableIterator<? extends E>)iterator).reset(); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java b/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java index b412492..f7fe023 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java +++ b/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java @@ -108,6 +108,7 @@ public abstract class LazyIteratorChain<E> implements Iterator<E> { * * @return true if elements remain */ + @Override public boolean hasNext() { updateCurrentIterator(); lastUsedIterator = currentIterator; @@ -121,6 +122,7 @@ public abstract class LazyIteratorChain<E> implements Iterator<E> { * @return element from the current Iterator * @throws java.util.NoSuchElementException if all the Iterators are exhausted */ + @Override public E next() { updateCurrentIterator(); lastUsedIterator = currentIterator; @@ -140,6 +142,7 @@ public abstract class LazyIteratorChain<E> implements Iterator<E> { * @throws IllegalStateException if the next method has not yet been called, * or the remove method has already been called after the last call to the next method. */ + @Override public void remove() { if (currentIterator == null) { updateCurrentIterator(); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java b/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java index 7764f83..54afd31 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java +++ b/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java @@ -93,6 +93,7 @@ public class ListIteratorWrapper<E> implements ResettableListIterator<E> { * @throws UnsupportedOperationException if the underlying iterator is not of * type {@link ListIterator} */ + @Override public void add(final E obj) throws UnsupportedOperationException { if (iterator instanceof ListIterator) { @SuppressWarnings("unchecked") @@ -108,6 +109,7 @@ public class ListIteratorWrapper<E> implements ResettableListIterator<E> { * * @return true if there are more elements */ + @Override public boolean hasNext() { if (currentIndex == wrappedIteratorIndex || iterator instanceof ListIterator) { return iterator.hasNext(); @@ -120,6 +122,7 @@ public class ListIteratorWrapper<E> implements ResettableListIterator<E> { * * @return true if there are previous elements */ + @Override public boolean hasPrevious() { if (iterator instanceof ListIterator) { final ListIterator<?> li = (ListIterator<?>) iterator; @@ -134,6 +137,7 @@ public class ListIteratorWrapper<E> implements ResettableListIterator<E> { * @return the next element from the iterator * @throws NoSuchElementException if there are no more elements */ + @Override public E next() throws NoSuchElementException { if (iterator instanceof ListIterator) { return iterator.next(); @@ -157,6 +161,7 @@ public class ListIteratorWrapper<E> implements ResettableListIterator<E> { * * @return the index of the next element */ + @Override public int nextIndex() { if (iterator instanceof ListIterator) { final ListIterator<?> li = (ListIterator<?>) iterator; @@ -171,6 +176,7 @@ public class ListIteratorWrapper<E> implements ResettableListIterator<E> { * @return the previous element * @throws NoSuchElementException if there are no previous elements */ + @Override public E previous() throws NoSuchElementException { if (iterator instanceof ListIterator) { @SuppressWarnings("unchecked") @@ -190,6 +196,7 @@ public class ListIteratorWrapper<E> implements ResettableListIterator<E> { * * @return the index of the previous element */ + @Override public int previousIndex() { if (iterator instanceof ListIterator) { final ListIterator<?> li = (ListIterator<?>) iterator; @@ -203,6 +210,7 @@ public class ListIteratorWrapper<E> implements ResettableListIterator<E> { * * @throws UnsupportedOperationException always */ + @Override public void remove() throws UnsupportedOperationException { if (iterator instanceof ListIterator) { iterator.remove(); @@ -230,6 +238,7 @@ public class ListIteratorWrapper<E> implements ResettableListIterator<E> { * @throws UnsupportedOperationException if the underlying iterator is not of * type {@link ListIterator} */ + @Override public void set(final E obj) throws UnsupportedOperationException { if (iterator instanceof ListIterator) { @SuppressWarnings("unchecked") @@ -248,6 +257,7 @@ public class ListIteratorWrapper<E> implements ResettableListIterator<E> { * * @since 3.2 */ + @Override public void reset() { if (iterator instanceof ListIterator) { final ListIterator<?> li = (ListIterator<?>) iterator; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java index f0c9bc2..58720c8 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java @@ -67,6 +67,7 @@ public class LoopingIterator<E> implements ResettableIterator<E> { * * @return <code>true</code> if there are more elements */ + @Override public boolean hasNext() { return collection.size() > 0; } @@ -80,6 +81,7 @@ public class LoopingIterator<E> implements ResettableIterator<E> { * @throws NoSuchElementException if there are no elements * at all. Use {@link #hasNext} to avoid this error. */ + @Override public E next() { if (collection.size() == 0) { throw new NoSuchElementException("There are no elements for this iterator to loop on"); @@ -102,6 +104,7 @@ public class LoopingIterator<E> implements ResettableIterator<E> { * next has been performed. If the {@link #reset} is called, then remove may * not be called until {@link #next} is called again. */ + @Override public void remove() { iterator.remove(); } @@ -109,6 +112,7 @@ public class LoopingIterator<E> implements ResettableIterator<E> { /** * Resets the iterator back to the start of the collection. */ + @Override public void reset() { iterator = collection.iterator(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java index 3b2af7e..f079238 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java @@ -70,6 +70,7 @@ public class LoopingListIterator<E> implements ResettableListIterator<E> { * * @return <code>true</code> if there are more elements */ + @Override public boolean hasNext() { return !list.isEmpty(); } @@ -82,6 +83,7 @@ public class LoopingListIterator<E> implements ResettableListIterator<E> { * @return the object after the last element returned * @throws NoSuchElementException if there are no elements in the list */ + @Override public E next() { if (list.isEmpty()) { throw new NoSuchElementException( @@ -104,6 +106,7 @@ public class LoopingListIterator<E> implements ResettableListIterator<E> { * @return the index of the element that would be returned if next() were called * @throws NoSuchElementException if there are no elements in the list */ + @Override public int nextIndex() { if (list.isEmpty()) { throw new NoSuchElementException( @@ -123,6 +126,7 @@ public class LoopingListIterator<E> implements ResettableListIterator<E> { * * @return <code>true</code> if there are more elements */ + @Override public boolean hasPrevious() { return !list.isEmpty(); } @@ -136,6 +140,7 @@ public class LoopingListIterator<E> implements ResettableListIterator<E> { * @return the object before the last element returned * @throws NoSuchElementException if there are no elements in the list */ + @Override public E previous() { if (list.isEmpty()) { throw new NoSuchElementException( @@ -163,6 +168,7 @@ public class LoopingListIterator<E> implements ResettableListIterator<E> { * @return the index of the element that would be returned if previous() were called * @throws NoSuchElementException if there are no elements in the list */ + @Override public int previousIndex() { if (list.isEmpty()) { throw new NoSuchElementException( @@ -192,6 +198,7 @@ public class LoopingListIterator<E> implements ResettableListIterator<E> { * not supported by the iterator implementation of the underlying * list */ + @Override public void remove() { iterator.remove(); } @@ -211,6 +218,7 @@ public class LoopingListIterator<E> implements ResettableListIterator<E> { * @throws UnsupportedOperationException if the add method is not * supported by the iterator implementation of the underlying list */ + @Override public void add(final E obj) { iterator.add(obj); } @@ -227,6 +235,7 @@ public class LoopingListIterator<E> implements ResettableListIterator<E> { * @throws UnsupportedOperationException if the set method is not * supported by the iterator implementation of the underlying list */ + @Override public void set(final E obj) { iterator.set(obj); } @@ -234,6 +243,7 @@ public class LoopingListIterator<E> implements ResettableListIterator<E> { /** * Resets the iterator back to the start of the list. */ + @Override public void reset() { _reset(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java index d88ce0d..ea37d5e 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java @@ -66,10 +66,12 @@ public class NodeListIterator implements Iterator<Node> { this.nodeList = nodeList; } + @Override public boolean hasNext() { return nodeList == null ? false : index < nodeList.getLength(); } + @Override public Node next() { if (nodeList != null && index < nodeList.getLength()) { return nodeList.item(index++); @@ -82,6 +84,7 @@ public class NodeListIterator implements Iterator<Node> { * * @throws UnsupportedOperationException always */ + @Override public void remove() { throw new UnsupportedOperationException("remove() method not supported for a NodeListIterator."); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java index 474d4ba..ff4c6f3 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java @@ -107,6 +107,7 @@ public class ObjectArrayIterator<E> implements ResettableIterator<E> { * * @return true if there is a next element to return */ + @Override public boolean hasNext() { return this.index < this.endIndex; } @@ -118,6 +119,7 @@ public class ObjectArrayIterator<E> implements ResettableIterator<E> { * @throws NoSuchElementException if all the elements in the array * have already been returned */ + @Override public E next() { if (hasNext() == false) { throw new NoSuchElementException(); @@ -130,6 +132,7 @@ public class ObjectArrayIterator<E> implements ResettableIterator<E> { * * @throws UnsupportedOperationException always */ + @Override public void remove() { throw new UnsupportedOperationException("remove() method is not supported for an ObjectArrayIterator"); } @@ -167,6 +170,7 @@ public class ObjectArrayIterator<E> implements ResettableIterator<E> { /** * Resets the iterator back to the start index. */ + @Override public void reset() { this.index = this.startIndex; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java index 7d6f696..b107f6e 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java @@ -95,6 +95,7 @@ public class ObjectArrayListIterator<E> extends ObjectArrayIterator<E> * * @return true if there is a previous element to return */ + @Override public boolean hasPrevious() { return this.index > getStartIndex(); } @@ -105,6 +106,7 @@ public class ObjectArrayListIterator<E> extends ObjectArrayIterator<E> * @return the previous element * @throws NoSuchElementException if there is no previous element */ + @Override public E previous() { if (hasPrevious() == false) { throw new NoSuchElementException(); @@ -133,6 +135,7 @@ public class ObjectArrayListIterator<E> extends ObjectArrayIterator<E> * * @return the index of the item to be retrieved next */ + @Override public int nextIndex() { return this.index - getStartIndex(); } @@ -142,6 +145,7 @@ public class ObjectArrayListIterator<E> extends ObjectArrayIterator<E> * * @return the index of the item to be retrieved next */ + @Override public int previousIndex() { return this.index - getStartIndex() - 1; } @@ -153,6 +157,7 @@ public class ObjectArrayListIterator<E> extends ObjectArrayIterator<E> * @param obj the object to add * @throws UnsupportedOperationException always thrown. */ + @Override public void add(final E obj) { throw new UnsupportedOperationException("add() method is not supported"); } @@ -174,6 +179,7 @@ public class ObjectArrayListIterator<E> extends ObjectArrayIterator<E> * @throws IllegalStateException if next() has not yet been called. * @throws ClassCastException if the object type is unsuitable for the array */ + @Override public void set(final E obj) { if (this.lastItemIndex == -1) { throw new IllegalStateException("must call next() or previous() before a call to set()"); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java index a05d2f1..1b98f1c 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java @@ -205,6 +205,7 @@ public class ObjectGraphIterator<E> implements Iterator<E> { * * @return true if elements remain in the iteration */ + @Override public boolean hasNext() { updateCurrentIterator(); return hasNext; @@ -216,6 +217,7 @@ public class ObjectGraphIterator<E> implements Iterator<E> { * @return the next element from the iteration * @throws NoSuchElementException if all the Iterators are exhausted */ + @Override public E next() { updateCurrentIterator(); if (hasNext == false) { @@ -241,6 +243,7 @@ public class ObjectGraphIterator<E> implements Iterator<E> { * if the next method has not yet been called, or the remove method has * already been called after the last call to the next method. */ + @Override public void remove() { if (lastUsedIterator == null) { throw new IllegalStateException("Iterator remove() cannot be called at this time"); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java index 7ccb96a..56d2dd9 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java @@ -93,6 +93,7 @@ public class PeekingIterator<E> implements Iterator<E> { } //----------------------------------------------------------------------- + @Override public boolean hasNext() { if (exhausted) { return false; @@ -132,6 +133,7 @@ public class PeekingIterator<E> implements Iterator<E> { return slot; } + @Override public E next() { if (!hasNext()) { throw new NoSuchElementException(); @@ -149,6 +151,7 @@ public class PeekingIterator<E> implements Iterator<E> { * @throws IllegalStateException if {@link #peek()} or {@link #element()} has been called * prior to the call to {@link #remove()} */ + @Override public void remove() { if (slotFilled) { throw new IllegalStateException("peek() or element() called before remove()"); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java index 9b2b3d5..5f60632 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java @@ -95,6 +95,7 @@ public class PermutationIterator<E> implements Iterator<List<E>> { * Indicates if there are more permutation available. * @return true if there are more permutations, otherwise false */ + @Override public boolean hasNext() { return nextPermutation != null; } @@ -104,6 +105,7 @@ public class PermutationIterator<E> implements Iterator<List<E>> { * @return a list of the permutator's elements representing a permutation * @throws NoSuchElementException if there are no more permutations */ + @Override public List<E> next() { if (!hasNext()) { throw new NoSuchElementException(); @@ -149,6 +151,7 @@ public class PermutationIterator<E> implements Iterator<List<E>> { return result; } + @Override public void remove() { throw new UnsupportedOperationException("remove() is not supported"); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java index 1039014..bf4d49a 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java @@ -87,10 +87,12 @@ public class PushbackIterator<E> implements Iterator<E> { items.push(item); } + @Override public boolean hasNext() { return !items.isEmpty() ? true : iterator.hasNext(); } + @Override public E next() { return !items.isEmpty() ? items.pop() : iterator.next(); } @@ -100,6 +102,7 @@ public class PushbackIterator<E> implements Iterator<E> { * * @throws UnsupportedOperationException always */ + @Override public void remove() { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java index e4529e9..d5f192a 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java @@ -66,6 +66,7 @@ public class ReverseListIterator<E> implements ResettableListIterator<E> { * * @return true if there is another element */ + @Override public boolean hasNext() { return iterator.hasPrevious(); } @@ -76,6 +77,7 @@ public class ReverseListIterator<E> implements ResettableListIterator<E> { * * @return the next element in the iterator */ + @Override public E next() { final E obj = iterator.previous(); validForUpdate = true; @@ -87,6 +89,7 @@ public class ReverseListIterator<E> implements ResettableListIterator<E> { * * @return the index of the next element in the iterator */ + @Override public int nextIndex() { return iterator.previousIndex(); } @@ -96,6 +99,7 @@ public class ReverseListIterator<E> implements ResettableListIterator<E> { * * @return true if there is a previous element */ + @Override public boolean hasPrevious() { return iterator.hasNext(); } @@ -106,6 +110,7 @@ public class ReverseListIterator<E> implements ResettableListIterator<E> { * * @return the previous element in the iterator */ + @Override public E previous() { final E obj = iterator.next(); validForUpdate = true; @@ -117,6 +122,7 @@ public class ReverseListIterator<E> implements ResettableListIterator<E> { * * @return the index of the previous element in the iterator */ + @Override public int previousIndex() { return iterator.nextIndex(); } @@ -127,6 +133,7 @@ public class ReverseListIterator<E> implements ResettableListIterator<E> { * @throws UnsupportedOperationException if the list is unmodifiable * @throws IllegalStateException if there is no element to remove */ + @Override public void remove() { if (validForUpdate == false) { throw new IllegalStateException("Cannot remove from list until next() or previous() called"); @@ -141,6 +148,7 @@ public class ReverseListIterator<E> implements ResettableListIterator<E> { * @throws UnsupportedOperationException if the list is unmodifiable * @throws IllegalStateException if the iterator is not in a valid state for set */ + @Override public void set(final E obj) { if (validForUpdate == false) { throw new IllegalStateException("Cannot set to list until next() or previous() called"); @@ -155,6 +163,7 @@ public class ReverseListIterator<E> implements ResettableListIterator<E> { * @throws UnsupportedOperationException if the list is unmodifiable * @throws IllegalStateException if the iterator is not in a valid state for set */ + @Override public void add(final E obj) { // the validForUpdate flag is needed as the necessary previous() // method call re-enables remove and add @@ -170,6 +179,7 @@ public class ReverseListIterator<E> implements ResettableListIterator<E> { * Resets the iterator back to the start (which is the * end of the list as this is a reversed iterator) */ + @Override public void reset() { iterator = list.listIterator(list.size()); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java b/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java index 4426ba8..df15e8b 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java @@ -71,6 +71,7 @@ public class SingletonIterator<E> * * @return true if the single object hasn't been returned yet */ + @Override public boolean hasNext() { return beforeFirst && !removed; } @@ -84,6 +85,7 @@ public class SingletonIterator<E> * @throws NoSuchElementException if the single object has already * been returned */ + @Override public E next() { if (!beforeFirst || removed) { throw new NoSuchElementException(); @@ -101,6 +103,7 @@ public class SingletonIterator<E> * method. * @throws UnsupportedOperationException if remove is not supported */ + @Override public void remove() { if (removeAllowed) { if (removed || beforeFirst) { @@ -116,6 +119,7 @@ public class SingletonIterator<E> /** * Reset the iterator to the start. */ + @Override public void reset() { beforeFirst = true; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java index 9b6c27f..5dab9b8 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java @@ -51,6 +51,7 @@ public class SingletonListIterator<E> implements ResettableListIterator<E> { * * @return true if the single object hasn't been returned yet */ + @Override public boolean hasNext() { return beforeFirst && !removed; } @@ -62,6 +63,7 @@ public class SingletonListIterator<E> implements ResettableListIterator<E> { * * @return true if the single object has been returned */ + @Override public boolean hasPrevious() { return !beforeFirst && !removed; } @@ -72,6 +74,7 @@ public class SingletonListIterator<E> implements ResettableListIterator<E> { * * @return 0 or 1 depending on current state. */ + @Override public int nextIndex() { return beforeFirst ? 0 : 1; } @@ -83,6 +86,7 @@ public class SingletonListIterator<E> implements ResettableListIterator<E> { * * @return 0 or -1 depending on current state. */ + @Override public int previousIndex() { return beforeFirst ? -1 : 0; } @@ -96,6 +100,7 @@ public class SingletonListIterator<E> implements ResettableListIterator<E> { * @throws NoSuchElementException if the single object has already * been returned */ + @Override public E next() { if (!beforeFirst || removed) { throw new NoSuchElementException(); @@ -114,6 +119,7 @@ public class SingletonListIterator<E> implements ResettableListIterator<E> { * @throws NoSuchElementException if the single object has not already * been returned */ + @Override public E previous() { if (beforeFirst || removed) { throw new NoSuchElementException(); @@ -129,6 +135,7 @@ public class SingletonListIterator<E> implements ResettableListIterator<E> { * has already been called after the last call to {@code next} * or {@code previous}. */ + @Override public void remove() { if(!nextCalled || removed) { throw new IllegalStateException(); @@ -143,6 +150,7 @@ public class SingletonListIterator<E> implements ResettableListIterator<E> { * @param obj the object to add * @throws UnsupportedOperationException always */ + @Override public void add(final E obj) { throw new UnsupportedOperationException("add() is not supported by this iterator"); } @@ -154,6 +162,7 @@ public class SingletonListIterator<E> implements ResettableListIterator<E> { * @throws IllegalStateException if {@code next} has not been called * or the object has been removed */ + @Override public void set(final E obj) { if (!nextCalled || removed) { throw new IllegalStateException(); @@ -164,6 +173,7 @@ public class SingletonListIterator<E> implements ResettableListIterator<E> { /** * Reset the iterator back to the start. */ + @Override public void reset() { beforeFirst = true; nextCalled = false; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java b/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java index 47e2ad3..09efade 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java @@ -70,6 +70,7 @@ public class TransformIterator<I, O> implements Iterator<O> { } //----------------------------------------------------------------------- + @Override public boolean hasNext() { return iterator.hasNext(); } @@ -82,10 +83,12 @@ public class TransformIterator<I, O> implements Iterator<O> { * @return the next object * @throws java.util.NoSuchElementException if there are no more elements */ + @Override public O next() { return transform(iterator.next()); } + @Override public void remove() { iterator.remove(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java index d6d566d..bee6d25 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java @@ -68,14 +68,17 @@ public final class UnmodifiableIterator<E> implements Iterator<E>, Unmodifiable } //----------------------------------------------------------------------- + @Override public boolean hasNext() { return iterator.hasNext(); } + @Override public E next() { return iterator.next(); } + @Override public void remove() { throw new UnsupportedOperationException("remove() is not supported"); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java index 7e33595..6861fd9 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java @@ -66,38 +66,47 @@ public final class UnmodifiableListIterator<E> implements ListIterator<E>, Unmod } //----------------------------------------------------------------------- + @Override public boolean hasNext() { return iterator.hasNext(); } + @Override public E next() { return iterator.next(); } + @Override public int nextIndex() { return iterator.nextIndex(); } + @Override public boolean hasPrevious() { return iterator.hasPrevious(); } + @Override public E previous() { return iterator.previous(); } + @Override public int previousIndex() { return iterator.previousIndex(); } + @Override public void remove() { throw new UnsupportedOperationException("remove() is not supported"); } + @Override public void set(final E obj) { throw new UnsupportedOperationException("set() is not supported"); } + @Override public void add(final E obj) { throw new UnsupportedOperationException("add() is not supported"); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java index 659c9b1..154fd8a 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java @@ -67,26 +67,32 @@ public final class UnmodifiableMapIterator<K, V> implements MapIterator<K, V>, U } //----------------------------------------------------------------------- + @Override public boolean hasNext() { return iterator.hasNext(); } + @Override public K next() { return iterator.next(); } + @Override public K getKey() { return iterator.getKey(); } + @Override public V getValue() { return iterator.getValue(); } + @Override public V setValue(final V value) { throw new UnsupportedOperationException("setValue() is not supported"); } + @Override public void remove() { throw new UnsupportedOperationException("remove() is not supported"); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java index 263a53b..52421e7 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java @@ -69,34 +69,42 @@ public final class UnmodifiableOrderedMapIterator<K, V> implements OrderedMapIte } //----------------------------------------------------------------------- + @Override public boolean hasNext() { return iterator.hasNext(); } + @Override public K next() { return iterator.next(); } + @Override public boolean hasPrevious() { return iterator.hasPrevious(); } + @Override public K previous() { return iterator.previous(); } + @Override public K getKey() { return iterator.getKey(); } + @Override public V getValue() { return iterator.getValue(); } + @Override public V setValue(final V value) { throw new UnsupportedOperationException("setValue() is not supported"); } + @Override public void remove() { throw new UnsupportedOperationException("remove() is not supported"); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java index 8937f3f..4558498 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java @@ -104,6 +104,7 @@ public class ZippingIterator<E> implements Iterator<E> { * * @return true if this iterator has remaining elements */ + @Override public boolean hasNext() { // the next iterator has already been determined // this might happen if hasNext() is called multiple @@ -130,6 +131,7 @@ public class ZippingIterator<E> implements Iterator<E> { * @return the next interleaved element * @throws NoSuchElementException if no child iterator has any more elements */ + @Override public E next() throws NoSuchElementException { if (!hasNext()) { throw new NoSuchElementException(); @@ -147,6 +149,7 @@ public class ZippingIterator<E> implements Iterator<E> { * @throws IllegalStateException if there is no last returned element, or if * the last returned element has already been removed */ + @Override public void remove() { if (lastReturned == null) { throw new IllegalStateException("No value can be removed at present"); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java index 02c8864..f8e3329 100644 --- a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java +++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java @@ -49,6 +49,7 @@ public abstract class AbstractKeyValue<K, V> implements KeyValue<K, V> { * * @return the key */ + @Override public K getKey() { return key; } @@ -64,6 +65,7 @@ public abstract class AbstractKeyValue<K, V> implements KeyValue<K, V> { * * @return the value */ + @Override public V getValue() { return value; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java index 72ee5ac..dc7def2 100644 --- a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java +++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java @@ -56,14 +56,17 @@ public abstract class AbstractMapEntryDecorator<K, V> implements Map.Entry<K, V> //----------------------------------------------------------------------- + @Override public K getKey() { return entry.getKey(); } + @Override public V getValue() { return entry.getValue(); } + @Override public V setValue(final V object) { return entry.setValue(object); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java index a585ac8..613d3f3 100644 --- a/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java +++ b/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java @@ -60,6 +60,7 @@ public class TiedMapEntry<K, V> implements Map.Entry<K, V>, KeyValue<K, V>, Seri * * @return the key */ + @Override public K getKey() { return key; } @@ -69,6 +70,7 @@ public class TiedMapEntry<K, V> implements Map.Entry<K, V>, KeyValue<K, V>, Seri * * @return the value */ + @Override public V getValue() { return map.get(key); } @@ -80,6 +82,7 @@ public class TiedMapEntry<K, V> implements Map.Entry<K, V>, KeyValue<K, V>, Seri * @return the old value * @throws IllegalArgumentException if the value is set to this map entry */ + @Override public V setValue(final V value) { if (value == this) { throw new IllegalArgumentException("Cannot set value to this map entry"); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java index 9e80e07..2d3ea0d 100644 --- a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java +++ b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java @@ -100,14 +100,17 @@ public abstract class AbstractLinkedList<E> implements List<E> { //----------------------------------------------------------------------- + @Override public int size() { return size; } + @Override public boolean isEmpty() { return size() == 0; } + @Override public E get(final int index) { final Node<E> node = getNode(index, false); return node.getValue(); @@ -115,20 +118,24 @@ public abstract class AbstractLinkedList<E> implements List<E> { //----------------------------------------------------------------------- + @Override public Iterator<E> iterator() { return listIterator(); } + @Override public ListIterator<E> listIterator() { return new LinkedListIterator<E>(this, 0); } + @Override public ListIterator<E> listIterator(final int fromIndex) { return new LinkedListIterator<E>(this, fromIndex); } //----------------------------------------------------------------------- + @Override public int indexOf(final Object value) { int i = 0; for (Node<E> node = header.next; node != header; node = node.next) { @@ -140,6 +147,7 @@ public abstract class AbstractLinkedList<E> implements List<E> { return -1; } + @Override public int lastIndexOf(final Object value) { int i = size - 1; for (Node<E> node = header.previous; node != header; node = node.previous) { @@ -151,10 +159,12 @@ public abstract class AbstractLinkedList<E> implements List<E> { return -1; } + @Override public boolean contains(final Object value) { return indexOf(value) != -1; } + @Override public boolean containsAll(final Collection<?> coll) { for (final Object o : coll) { if (!contains(o)) { @@ -166,10 +176,12 @@ public abstract class AbstractLinkedList<E> implements List<E> { //----------------------------------------------------------------------- + @Override public Object[] toArray() { return toArray(new Object[size]); } + @Override @SuppressWarnings("unchecked") public <T> T[] toArray(T[] array) { // Extend the array if needed @@ -196,26 +208,31 @@ public abstract class AbstractLinkedList<E> implements List<E> { * @param toIndexExclusive the index to end at * @return the new sublist */ + @Override public List<E> subList(final int fromIndexInclusive, final int toIndexExclusive) { return new LinkedSubList<E>(this, fromIndexInclusive, toIndexExclusive); } //----------------------------------------------------------------------- + @Override public boolean add(final E value) { addLast(value); return true; } + @Override public void add(final int index, final E value) { final Node<E> node = getNode(index, true); addNodeBefore(node, value); } + @Override public boolean addAll(final Collection<? extends E> coll) { return addAll(size, coll); } + @Override public boolean addAll(final int index, final Collection<? extends E> coll) { final Node<E> node = getNode(index, true); for (final E e : coll) { @@ -226,6 +243,7 @@ public abstract class AbstractLinkedList<E> implements List<E> { //----------------------------------------------------------------------- + @Override public E remove(final int index) { final Node<E> node = getNode(index, false); final E oldValue = node.getValue(); @@ -233,6 +251,7 @@ public abstract class AbstractLinkedList<E> implements List<E> { return oldValue; } + @Override public boolean remove(final Object value) { for (Node<E> node = header.next; node != header; node = node.next) { if (isEqualValue(node.getValue(), value)) { @@ -252,6 +271,7 @@ public abstract class AbstractLinkedList<E> implements List<E> { * <code>coll</code> that provides a fast (e.g. O(1)) implementation of * {@link Collection#contains(Object)}. */ + @Override public boolean removeAll(final Collection<?> coll) { boolean modified = false; final Iterator<E> it = iterator(); @@ -275,6 +295,7 @@ public abstract class AbstractLinkedList<E> implements List<E> { * <code>coll</code> that provides a fast (e.g. O(1)) implementation of * {@link Collection#contains(Object)}. */ + @Override public boolean retainAll(final Collection<?> coll) { boolean modified = false; final Iterator<E> it = iterator(); @@ -287,6 +308,7 @@ public abstract class AbstractLinkedList<E> implements List<E> { return modified; } + @Override public E set(final int index, final E value) { final Node<E> node = getNode(index, false); final E oldValue = node.getValue(); @@ -294,6 +316,7 @@ public abstract class AbstractLinkedList<E> implements List<E> { return oldValue; } + @Override public void clear() { removeAllNodes(); } @@ -816,10 +839,12 @@ public abstract class AbstractLinkedList<E> implements List<E> { return current; } + @Override public boolean hasNext() { return next != parent.header; } + @Override public E next() { checkModCount(); if (!hasNext()) { @@ -832,10 +857,12 @@ public abstract class AbstractLinkedList<E> implements List<E> { return value; } + @Override public boolean hasPrevious() { return next.previous != parent.header; } + @Override public E previous() { checkModCount(); if (!hasPrevious()) { @@ -848,15 +875,18 @@ public abstract class AbstractLinkedList<E> implements List<E> { return value; } + @Override public int nextIndex() { return nextIndex; } + @Override public int previousIndex() { // not normally overridden, as relative to nextIndex() return nextIndex() - 1; } + @Override public void remove() { checkModCount(); if (current == next) { @@ -872,11 +902,13 @@ public abstract class AbstractLinkedList<E> implements List<E> { expectedModCount++; } + @Override public void set(final E obj) { checkModCount(); getLastNodeReturned().setValue(obj); } + @Override public void add(final E obj) { checkModCount(); parent.addNodeBefore(next, obj); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java b/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java index be24054..bef23bf 100644 --- a/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java +++ b/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java @@ -77,42 +77,52 @@ public abstract class AbstractListDecorator<E> extends AbstractCollectionDecorat //----------------------------------------------------------------------- + @Override public void add(final int index, final E object) { decorated().add(index, object); } + @Override public boolean addAll(final int index, final Collection<? extends E> coll) { return decorated().addAll(index, coll); } + @Override public E get(final int index) { return decorated().get(index); } + @Override public int indexOf(final Object object) { return decorated().indexOf(object); } + @Override public int lastIndexOf(final Object object) { return decorated().lastIndexOf(object); } + @Override public ListIterator<E> listIterator() { return decorated().listIterator(); } + @Override public ListIterator<E> listIterator(final int index) { return decorated().listIterator(index); } + @Override public E remove(final int index) { return decorated().remove(index); } + @Override public E set(final int index, final E object) { return decorated().set(index, object); } + @Override public List<E> subList(final int fromIndex, final int toIndex) { return decorated().subList(fromIndex, toIndex); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java b/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java index 33ee16c..7c2f16f 100644 --- a/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java +++ b/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java @@ -171,10 +171,12 @@ public class FixedSizeList<E> } } + @Override public boolean isFull() { return true; } + @Override public int maxSize() { return size(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/list/PredicatedList.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/list/PredicatedList.java b/src/main/java/org/apache/commons/collections4/list/PredicatedList.java index b158fdc..bc475be 100644 --- a/src/main/java/org/apache/commons/collections4/list/PredicatedList.java +++ b/src/main/java/org/apache/commons/collections4/list/PredicatedList.java @@ -106,29 +106,35 @@ public class PredicatedList<E> extends PredicatedCollection<E> implements List<E //----------------------------------------------------------------------- + @Override public E get(final int index) { return decorated().get(index); } + @Override public int indexOf(final Object object) { return decorated().indexOf(object); } + @Override public int lastIndexOf(final Object object) { return decorated().lastIndexOf(object); } + @Override public E remove(final int index) { return decorated().remove(index); } //----------------------------------------------------------------------- + @Override public void add(final int index, final E object) { validate(object); decorated().add(index, object); } + @Override public boolean addAll(final int index, final Collection<? extends E> coll) { for (final E aColl : coll) { validate(aColl); @@ -136,19 +142,23 @@ public class PredicatedList<E> extends PredicatedCollection<E> implements List<E return decorated().addAll(index, coll); } + @Override public ListIterator<E> listIterator() { return listIterator(0); } + @Override public ListIterator<E> listIterator(final int i) { return new PredicatedListIterator(decorated().listIterator(i)); } + @Override public E set(final int index, final E object) { validate(object); return decorated().set(index, object); } + @Override public List<E> subList(final int fromIndex, final int toIndex) { final List<E> sub = decorated().subList(fromIndex, toIndex); return new PredicatedList<E>(sub, predicate); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/list/TransformedList.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/list/TransformedList.java b/src/main/java/org/apache/commons/collections4/list/TransformedList.java index 968368c..01d4894 100644 --- a/src/main/java/org/apache/commons/collections4/list/TransformedList.java +++ b/src/main/java/org/apache/commons/collections4/list/TransformedList.java @@ -126,47 +126,57 @@ public class TransformedList<E> extends TransformedCollection<E> implements List //----------------------------------------------------------------------- + @Override public E get(final int index) { return getList().get(index); } + @Override public int indexOf(final Object object) { return getList().indexOf(object); } + @Override public int lastIndexOf(final Object object) { return getList().lastIndexOf(object); } + @Override public E remove(final int index) { return getList().remove(index); } //----------------------------------------------------------------------- + @Override public void add(final int index, E object) { object = transform(object); getList().add(index, object); } + @Override public boolean addAll(final int index, Collection<? extends E> coll) { coll = transform(coll); return getList().addAll(index, coll); } + @Override public ListIterator<E> listIterator() { return listIterator(0); } + @Override public ListIterator<E> listIterator(final int i) { return new TransformedListIterator(getList().listIterator(i)); } + @Override public E set(final int index, E object) { object = transform(object); return getList().set(index, object); } + @Override public List<E> subList(final int fromIndex, final int toIndex) { final List<E> sub = getList().subList(fromIndex, toIndex); return new TransformedList<E>(sub, transformer); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/list/TreeList.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/list/TreeList.java b/src/main/java/org/apache/commons/collections4/list/TreeList.java index 43d5919..c318eaf 100644 --- a/src/main/java/org/apache/commons/collections4/list/TreeList.java +++ b/src/main/java/org/apache/commons/collections4/list/TreeList.java @@ -1034,10 +1034,12 @@ public class TreeList<E> extends AbstractList<E> { } } + @Override public boolean hasNext() { return nextIndex < parent.size(); } + @Override public E next() { checkModCount(); if (!hasNext()) { @@ -1053,10 +1055,12 @@ public class TreeList<E> extends AbstractList<E> { return value; } + @Override public boolean hasPrevious() { return nextIndex > 0; } + @Override public E previous() { checkModCount(); if (!hasPrevious()) { @@ -1073,14 +1077,17 @@ public class TreeList<E> extends AbstractList<E> { return value; } + @Override public int nextIndex() { return nextIndex; } + @Override public int previousIndex() { return nextIndex() - 1; } + @Override public void remove() { checkModCount(); if (currentIndex == -1) { @@ -1099,6 +1106,7 @@ public class TreeList<E> extends AbstractList<E> { expectedModCount++; } + @Override public void set(final E obj) { checkModCount(); if (current == null) { @@ -1107,6 +1115,7 @@ public class TreeList<E> extends AbstractList<E> { current.setValue(obj); } + @Override public void add(final E obj) { checkModCount(); parent.add(nextIndex, obj); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java index 195cb60..6f2867b 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java @@ -752,6 +752,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab * * @return the map iterator */ + @Override public MapIterator<K, V> mapIterator() { if (size == 0) { return EmptyMapIterator.<K, V>emptyMapIterator(); @@ -768,10 +769,12 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab super(parent); } + @Override public K next() { return super.nextEntry().getKey(); } + @Override public K getKey() { final HashEntry<K, V> current = currentEntry(); if (current == null) { @@ -780,6 +783,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab return current.getKey(); } + @Override public V getValue() { final HashEntry<K, V> current = currentEntry(); if (current == null) { @@ -788,6 +792,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab return current.getValue(); } + @Override public V setValue(final V value) { final HashEntry<K, V> current = currentEntry(); if (current == null) { @@ -886,6 +891,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab super(parent); } + @Override public Map.Entry<K, V> next() { return super.nextEntry(); } @@ -970,6 +976,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab super((AbstractHashedMap<K, Object>) parent); } + @Override public K next() { return super.nextEntry().getKey(); } @@ -1047,6 +1054,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab super((AbstractHashedMap<Object, V>) parent); } + @Override public V next() { return super.nextEntry().getValue(); } @@ -1079,6 +1087,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab this.value = value; } + @Override @SuppressWarnings("unchecked") public K getKey() { if (key == NULL) { @@ -1087,11 +1096,13 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab return (K) key; } + @Override @SuppressWarnings("unchecked") public V getValue() { return (V) value; } + @Override @SuppressWarnings("unchecked") public V setValue(final V value) { final Object old = this.value; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java index 104b4ba..c66b1be 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java @@ -30,6 +30,7 @@ public abstract class AbstractIterableMap<K, V> implements IterableMap<K, V> { /** * {@inheritDoc} */ + @Override public MapIterator<K, V> mapIterator() { return new EntrySetToMapIteratorAdapter<K, V>(entrySet()); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java index 6d84771..c4b63df 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java @@ -171,6 +171,7 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im * * @return the eldest key */ + @Override public K firstKey() { if (size == 0) { throw new NoSuchElementException("Map is empty"); @@ -183,6 +184,7 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im * * @return the most recently inserted key */ + @Override public K lastKey() { if (size == 0) { throw new NoSuchElementException("Map is empty"); @@ -196,6 +198,7 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im * @param key the key to get after * @return the next key */ + @Override public K nextKey(final Object key) { final LinkEntry<K, V> entry = getEntry(key); return entry == null || entry.after == header ? null : entry.after.getKey(); @@ -212,6 +215,7 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im * @param key the key to get before * @return the previous key */ + @Override public K previousKey(final Object key) { final LinkEntry<K, V> entry = getEntry(key); return entry == null || entry.before == header ? null : entry.before.getKey(); @@ -353,14 +357,17 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im super(parent); } + @Override public K next() { return super.nextEntry().getKey(); } + @Override public K previous() { return super.previousEntry().getKey(); } + @Override public K getKey() { final LinkEntry<K, V> current = currentEntry(); if (current == null) { @@ -369,6 +376,7 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im return current.getKey(); } + @Override public V getValue() { final LinkEntry<K, V> current = currentEntry(); if (current == null) { @@ -377,6 +385,7 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im return current.getValue(); } + @Override public V setValue(final V value) { final LinkEntry<K, V> current = currentEntry(); if (current == null) { @@ -411,10 +420,12 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im super(parent); } + @Override public Map.Entry<K, V> next() { return super.nextEntry(); } + @Override public Map.Entry<K, V> previous() { return super.previousEntry(); } @@ -446,10 +457,12 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im super((AbstractLinkedMap<K, Object>) parent); } + @Override public K next() { return super.nextEntry().getKey(); } + @Override public K previous() { return super.previousEntry().getKey(); } @@ -481,10 +494,12 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im super((AbstractLinkedMap<Object, V>) parent); } + @Override public V next() { return super.nextEntry().getValue(); } + @Override public V previous() { return super.previousEntry().getValue(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java index d718370..1939bad 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java @@ -74,50 +74,62 @@ public abstract class AbstractMapDecorator<K, V> extends AbstractIterableMap<K, } //----------------------------------------------------------------------- + @Override public void clear() { decorated().clear(); } + @Override public boolean containsKey(final Object key) { return decorated().containsKey(key); } + @Override public boolean containsValue(final Object value) { return decorated().containsValue(value); } + @Override public Set<Map.Entry<K, V>> entrySet() { return decorated().entrySet(); } + @Override public V get(final Object key) { return decorated().get(key); } + @Override public boolean isEmpty() { return decorated().isEmpty(); } + @Override public Set<K> keySet() { return decorated().keySet(); } + @Override public V put(final K key, final V value) { return decorated().put(key, value); } + @Override public void putAll(final Map<? extends K, ? extends V> mapToCopy) { decorated().putAll(mapToCopy); } + @Override public V remove(final Object key) { return decorated().remove(key); } + @Override public int size() { return decorated().size(); } + @Override public Collection<V> values() { return decorated().values(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java index f4d2eb4..6c06d2f 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java @@ -66,18 +66,22 @@ public abstract class AbstractOrderedMapDecorator<K, V> extends AbstractMapDecor } //----------------------------------------------------------------------- + @Override public K firstKey() { return decorated().firstKey(); } + @Override public K lastKey() { return decorated().lastKey(); } + @Override public K nextKey(final K key) { return decorated().nextKey(key); } + @Override public K previousKey(final K key) { return decorated().previousKey(key); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java index 7611b48..d32e63f 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java @@ -856,6 +856,7 @@ public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V> super(parent); } + @Override public Map.Entry<K, V> next() { return nextEntry(); } @@ -872,6 +873,7 @@ public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V> super((AbstractReferenceMap<K, Object>) parent); } + @Override public K next() { return nextEntry().getKey(); } @@ -887,6 +889,7 @@ public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V> super((AbstractReferenceMap<Object, V>) parent); } + @Override public V next() { return nextEntry().getValue(); } @@ -901,10 +904,12 @@ public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V> super(parent); } + @Override public K next() { return nextEntry().getKey(); } + @Override public K getKey() { final HashEntry<K, V> current = currentEntry(); if (current == null) { @@ -913,6 +918,7 @@ public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V> return current.getKey(); } + @Override public V getValue() { final HashEntry<K, V> current = currentEntry(); if (current == null) { @@ -921,6 +927,7 @@ public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V> return current.getValue(); } + @Override public V setValue(final V value) { final HashEntry<K, V> current = currentEntry(); if (current == null) { http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java index c867db1..d032197 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java @@ -76,35 +76,43 @@ public abstract class AbstractSortedMapDecorator<K, V> extends AbstractMapDecora } //----------------------------------------------------------------------- + @Override public Comparator<? super K> comparator() { return decorated().comparator(); } + @Override public K firstKey() { return decorated().firstKey(); } + @Override public K lastKey() { return decorated().lastKey(); } + @Override public SortedMap<K, V> subMap(final K fromKey, final K toKey) { return decorated().subMap(fromKey, toKey); } + @Override public SortedMap<K, V> headMap(final K toKey) { return decorated().headMap(toKey); } + @Override public SortedMap<K, V> tailMap(final K fromKey) { return decorated().tailMap(fromKey); } + @Override public K previousKey(final K key) { final SortedMap<K, V> headMap = headMap(key); return headMap.isEmpty() ? null : headMap.lastKey(); } + @Override public K nextKey(final K key) { final Iterator<K> it = tailMap(key).keySet().iterator(); it.next(); @@ -148,6 +156,7 @@ public abstract class AbstractSortedMapDecorator<K, V> extends AbstractMapDecora /** * {@inheritDoc} */ + @Override public boolean hasPrevious() { return ((ListIterator<Map.Entry<K, V>>) iterator).hasPrevious(); } @@ -155,6 +164,7 @@ public abstract class AbstractSortedMapDecorator<K, V> extends AbstractMapDecora /** * {@inheritDoc} */ + @Override public K previous() { entry = ((ListIterator<Map.Entry<K, V>>) iterator).previous(); return getKey();
