Add missing @Overrides git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1734633 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/5250fdfd Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/5250fdfd Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/5250fdfd Branch: refs/heads/master Commit: 5250fdfdf3720a96366cac57fd216e8fa6c13cce Parents: cfffa71 Author: Gary D. Gregory <[email protected]> Authored: Fri Mar 11 21:12:21 2016 +0000 Committer: Gary D. Gregory <[email protected]> Committed: Fri Mar 11 21:12:21 2016 +0000 ---------------------------------------------------------------------- .../org/apache/commons/collections4/Bag.java | 7 ++++ .../apache/commons/collections4/BidiMap.java | 2 ++ .../commons/collections4/CollectionUtils.java | 4 +++ .../apache/commons/collections4/ListUtils.java | 3 ++ .../commons/collections4/MapIterator.java | 3 ++ .../apache/commons/collections4/MultiMap.java | 6 ++++ .../commons/collections4/OrderedBidiMap.java | 1 + .../apache/commons/collections4/OrderedMap.java | 1 + .../collections4/OrderedMapIterator.java | 2 ++ .../commons/collections4/SortedBidiMap.java | 1 + .../commons/collections4/SplitMapUtils.java | 25 +++++++++++++ .../functors/AbstractQuantifierPredicate.java | 1 + .../collections4/functors/AllPredicate.java | 1 + .../collections4/functors/AndPredicate.java | 2 ++ .../collections4/functors/AnyPredicate.java | 1 + .../functors/CatchAndRethrowClosure.java | 1 + .../collections4/functors/ChainedClosure.java | 1 + .../functors/ChainedTransformer.java | 1 + .../functors/ClosureTransformer.java | 1 + .../functors/ComparatorPredicate.java | 1 + .../collections4/functors/ConstantFactory.java | 1 + .../functors/ConstantTransformer.java | 1 + .../collections4/functors/DefaultEquator.java | 2 ++ .../collections4/functors/EqualPredicate.java | 1 + .../collections4/functors/ExceptionClosure.java | 1 + .../collections4/functors/ExceptionFactory.java | 1 + .../functors/ExceptionPredicate.java | 1 + .../functors/ExceptionTransformer.java | 1 + .../functors/FactoryTransformer.java | 1 + .../collections4/functors/FalsePredicate.java | 1 + .../functors/IdentityPredicate.java | 1 + .../collections4/functors/IfClosure.java | 1 + .../collections4/functors/IfTransformer.java | 1 + .../functors/InstanceofPredicate.java | 1 + .../collections4/functors/MapTransformer.java | 1 + .../collections4/functors/NOPClosure.java | 1 + .../collections4/functors/NOPTransformer.java | 1 + .../collections4/functors/NonePredicate.java | 1 + .../collections4/functors/NotNullPredicate.java | 1 + .../collections4/functors/NotPredicate.java | 2 ++ .../functors/NullIsExceptionPredicate.java | 2 ++ .../functors/NullIsFalsePredicate.java | 2 ++ .../functors/NullIsTruePredicate.java | 2 ++ .../collections4/functors/NullPredicate.java | 1 + .../collections4/functors/OnePredicate.java | 1 + .../collections4/functors/OrPredicate.java | 2 ++ .../functors/PredicateTransformer.java | 1 + .../functors/StringValueTransformer.java | 1 + .../collections4/functors/SwitchClosure.java | 1 + .../functors/SwitchTransformer.java | 1 + .../functors/TransformedPredicate.java | 2 ++ .../functors/TransformerClosure.java | 1 + .../functors/TransformerPredicate.java | 1 + .../collections4/functors/TruePredicate.java | 1 + .../collections4/functors/UniquePredicate.java | 1 + .../iterators/AbstractIteratorDecorator.java | 1 + .../AbstractListIteratorDecorator.java | 9 +++++ .../iterators/AbstractMapIteratorDecorator.java | 6 ++++ .../AbstractOrderedMapIteratorDecorator.java | 8 +++++ .../AbstractUntypedIteratorDecorator.java | 2 ++ .../collections4/iterators/ArrayIterator.java | 4 +++ .../iterators/ArrayListIterator.java | 6 ++++ .../collections4/iterators/BoundedIterator.java | 3 ++ .../iterators/CollatingIterator.java | 3 ++ .../iterators/EntrySetMapIterator.java | 7 ++++ .../iterators/EnumerationIterator.java | 3 ++ .../collections4/iterators/FilterIterator.java | 3 ++ .../iterators/FilterListIterator.java | 9 +++++ .../collections4/iterators/IteratorChain.java | 3 ++ .../iterators/IteratorEnumeration.java | 2 ++ .../iterators/IteratorIterable.java | 4 +++ .../iterators/LazyIteratorChain.java | 3 ++ .../iterators/ListIteratorWrapper.java | 10 ++++++ .../collections4/iterators/LoopingIterator.java | 4 +++ .../iterators/LoopingListIterator.java | 10 ++++++ .../iterators/NodeListIterator.java | 3 ++ .../iterators/ObjectArrayIterator.java | 4 +++ .../iterators/ObjectArrayListIterator.java | 6 ++++ .../iterators/ObjectGraphIterator.java | 3 ++ .../collections4/iterators/PeekingIterator.java | 3 ++ .../iterators/PermutationIterator.java | 3 ++ .../iterators/PushbackIterator.java | 3 ++ .../iterators/ReverseListIterator.java | 10 ++++++ .../iterators/SingletonIterator.java | 4 +++ .../iterators/SingletonListIterator.java | 10 ++++++ .../iterators/TransformIterator.java | 3 ++ .../iterators/UnmodifiableIterator.java | 3 ++ .../iterators/UnmodifiableListIterator.java | 9 +++++ .../iterators/UnmodifiableMapIterator.java | 6 ++++ .../UnmodifiableOrderedMapIterator.java | 8 +++++ .../collections4/iterators/ZippingIterator.java | 3 ++ .../collections4/keyvalue/AbstractKeyValue.java | 2 ++ .../keyvalue/AbstractMapEntryDecorator.java | 3 ++ .../collections4/keyvalue/TiedMapEntry.java | 3 ++ .../collections4/list/AbstractLinkedList.java | 32 +++++++++++++++++ .../list/AbstractListDecorator.java | 10 ++++++ .../collections4/list/FixedSizeList.java | 2 ++ .../collections4/list/PredicatedList.java | 10 ++++++ .../collections4/list/TransformedList.java | 10 ++++++ .../commons/collections4/list/TreeList.java | 9 +++++ .../collections4/map/AbstractHashedMap.java | 11 ++++++ .../collections4/map/AbstractIterableMap.java | 1 + .../collections4/map/AbstractLinkedMap.java | 15 ++++++++ .../collections4/map/AbstractMapDecorator.java | 12 +++++++ .../map/AbstractOrderedMapDecorator.java | 4 +++ .../collections4/map/AbstractReferenceMap.java | 7 ++++ .../map/AbstractSortedMapDecorator.java | 10 ++++++ .../commons/collections4/map/CompositeMap.java | 12 +++++++ .../map/EntrySetToMapIteratorAdapter.java | 7 ++++ .../commons/collections4/map/FixedSizeMap.java | 2 ++ .../collections4/map/FixedSizeSortedMap.java | 2 ++ .../commons/collections4/map/Flat3Map.java | 26 ++++++++++++++ .../apache/commons/collections4/map/LRUMap.java | 2 ++ .../commons/collections4/map/LazySortedMap.java | 6 ++++ .../collections4/map/ListOrderedMap.java | 16 +++++++++ .../collections4/map/PassiveExpiringMap.java | 1 + .../collections4/map/PredicatedSortedMap.java | 6 ++++ .../commons/collections4/map/SingletonMap.java | 30 ++++++++++++++++ .../collections4/map/StaticBucketMap.java | 18 ++++++++++ .../collections4/map/TransformedSortedMap.java | 6 ++++ .../queue/AbstractQueueDecorator.java | 5 +++ .../collections4/queue/CircularFifoQueue.java | 10 ++++++ .../collections4/queue/PredicatedQueue.java | 5 +++ .../collections4/queue/TransformedQueue.java | 5 +++ .../sequence/ReplacementsFinder.java | 3 ++ .../set/AbstractSortedSetDecorator.java | 6 ++++ .../commons/collections4/set/CompositeSet.java | 13 +++++++ .../collections4/set/ListOrderedSet.java | 2 ++ .../commons/collections4/set/MapBackedSet.java | 13 +++++++ .../collections4/set/PredicatedSortedSet.java | 6 ++++ .../collections4/set/TransformedSortedSet.java | 6 ++++ .../AbstractIterableGetMapDecorator.java | 10 ++++++ .../splitmap/TransformedSplitMap.java | 3 ++ .../collections4/trie/AbstractBitwiseTrie.java | 3 ++ .../collections4/trie/AbstractPatriciaTrie.java | 38 ++++++++++++++++++-- .../commons/collections4/trie/KeyAnalyzer.java | 1 + .../collections4/trie/UnmodifiableTrie.java | 22 ++++++++++++ .../commons/collections4/ClosureUtilsTest.java | 2 ++ .../commons/collections4/ListUtilsTest.java | 3 ++ .../commons/collections4/MapPerformance.java | 12 +++++++ .../commons/collections4/MapUtilsTest.java | 4 +++ .../commons/collections4/SplitMapUtilsTest.java | 13 +++++++ .../collections4/bag/PredicatedBagTest.java | 1 + .../bag/PredicatedSortedBagTest.java | 1 + .../commons/collections4/bag/TreeBagTest.java | 1 + .../bidimap/DualTreeBidiMap2Test.java | 1 + .../collection/CompositeCollectionTest.java | 9 +++++ .../collection/IndexedCollectionTest.java | 1 + .../PredicatedCollectionBuilderTest.java | 1 + .../collection/PredicatedCollectionTest.java | 1 + .../collection/TransformedCollectionTest.java | 1 + .../comparators/ComparatorChainTest.java | 2 ++ .../functors/ComparatorPredicateTest.java | 1 + .../iterators/BoundedIteratorTest.java | 1 + .../iterators/FilterIteratorTest.java | 3 ++ .../iterators/FilterListIteratorTest.java | 6 ++++ .../iterators/IteratorChainTest.java | 1 + .../iterators/LazyIteratorChainTest.java | 1 + .../iterators/NodeListIteratorTest.java | 4 +++ .../iterators/ObjectGraphIteratorTest.java | 1 + .../collections4/list/PredicatedListTest.java | 1 + .../collections4/map/CompositeMapTest.java | 9 +++++ .../collections4/map/DefaultedMapTest.java | 1 + .../collections4/map/EmptyMapMutator.java | 3 ++ .../commons/collections4/map/LazyMapTest.java | 1 + .../map/PassiveExpiringMapTest.java | 1 + .../collections4/map/PredicatedMapTest.java | 1 + .../map/PredicatedSortedMapTest.java | 1 + .../collections4/queue/PredicatedQueueTest.java | 1 + .../sequence/SequencesComparatorTest.java | 3 ++ .../collections4/set/CompositeSetTest.java | 3 ++ .../collections4/set/EmptySetMutator.java | 3 ++ .../set/PredicatedNavigableSetTest.java | 1 + .../collections4/set/PredicatedSetTest.java | 1 + .../set/PredicatedSortedSetTest.java | 1 + .../splitmap/TransformedSplitMapTest.java | 3 ++ 176 files changed, 817 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/Bag.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/Bag.java b/src/main/java/org/apache/commons/collections4/Bag.java index 8697df5..d500506 100644 --- a/src/main/java/org/apache/commons/collections4/Bag.java +++ b/src/main/java/org/apache/commons/collections4/Bag.java @@ -70,6 +70,7 @@ public interface Bag<E> extends Collection<E> { * @param object the object to add * @return <code>true</code> if the object was not already in the <code>uniqueSet</code> */ + @Override boolean add(E object); /** @@ -98,6 +99,7 @@ public interface Bag<E> extends Collection<E> { * @param object the object to remove * @return <code>true</code> if this call changed the collection */ + @Override boolean remove(Object object); /** @@ -126,6 +128,7 @@ public interface Bag<E> extends Collection<E> { * * @return the total size of the Bag */ + @Override int size(); /** @@ -144,6 +147,7 @@ public interface Bag<E> extends Collection<E> { * @param coll the collection to check against * @return <code>true</code> if the Bag contains all the collection */ + @Override boolean containsAll(Collection<?> coll); /** @@ -162,6 +166,7 @@ public interface Bag<E> extends Collection<E> { * @param coll the collection to remove * @return <code>true</code> if this call changed the collection */ + @Override boolean removeAll(Collection<?> coll); /** @@ -183,6 +188,7 @@ public interface Bag<E> extends Collection<E> { * @param coll the collection to retain * @return <code>true</code> if this call changed the collection */ + @Override boolean retainAll(Collection<?> coll); /** @@ -192,6 +198,7 @@ public interface Bag<E> extends Collection<E> { * * @return iterator over all elements in the Bag */ + @Override Iterator<E> iterator(); // The following is not part of the formal Bag interface, however where possible http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/BidiMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/BidiMap.java b/src/main/java/org/apache/commons/collections4/BidiMap.java index 1b8a34c..fbf342c 100644 --- a/src/main/java/org/apache/commons/collections4/BidiMap.java +++ b/src/main/java/org/apache/commons/collections4/BidiMap.java @@ -71,6 +71,7 @@ public interface BidiMap<K, V> extends IterableMap<K, V> { * @throws NullPointerException (optional) if the map limits the values to * non-null and null was specified */ + @Override V put(K key, V value); /** @@ -140,5 +141,6 @@ public interface BidiMap<K, V> extends IterableMap<K, V> { * * @return a set view of the values contained in this map */ + @Override Set<V> values(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/CollectionUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/CollectionUtils.java b/src/main/java/org/apache/commons/collections4/CollectionUtils.java index 5012fa0..c53b4c3 100644 --- a/src/main/java/org/apache/commons/collections4/CollectionUtils.java +++ b/src/main/java/org/apache/commons/collections4/CollectionUtils.java @@ -147,6 +147,7 @@ public class CollectionUtils { newList = new ArrayList<O>(elements.size()); } + @Override public Iterator<O> iterator() { return elements.iterator(); } @@ -561,6 +562,7 @@ public class CollectionUtils { @SuppressWarnings({ "unchecked", "rawtypes" }) final Transformer<E, ?> transformer = new Transformer() { + @Override public EquatorWrapper<?> transform(final Object input) { return new EquatorWrapper(equator, input); } @@ -1693,6 +1695,7 @@ public class CollectionUtils { final Equator<? super E> equator) { final Transformer<E, EquatorWrapper<E>> transformer = new Transformer<E, EquatorWrapper<E>>() { + @Override public EquatorWrapper<E> transform(E input) { return new EquatorWrapper<E>(equator, input); } @@ -1768,6 +1771,7 @@ public class CollectionUtils { final Equator<? super E> equator) { final Transformer<E, EquatorWrapper<E>> transformer = new Transformer<E, EquatorWrapper<E>>() { + @Override public EquatorWrapper<E> transform(E input) { return new EquatorWrapper<E>(equator, input); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/ListUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/ListUtils.java b/src/main/java/org/apache/commons/collections4/ListUtils.java index 605bde3..e13d60b 100644 --- a/src/main/java/org/apache/commons/collections4/ListUtils.java +++ b/src/main/java/org/apache/commons/collections4/ListUtils.java @@ -586,10 +586,13 @@ public class ListUtils { sequence = new ArrayList<E>(); } + @Override public void visitInsertCommand(final E object) {} + @Override public void visitDeleteCommand(final E object) {} + @Override public void visitKeepCommand(final E object) { sequence.add(object); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/MapIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/MapIterator.java b/src/main/java/org/apache/commons/collections4/MapIterator.java index 6c6d36f..f5647be 100644 --- a/src/main/java/org/apache/commons/collections4/MapIterator.java +++ b/src/main/java/org/apache/commons/collections4/MapIterator.java @@ -52,6 +52,7 @@ public interface MapIterator<K, V> extends Iterator<K> { * * @return <code>true</code> if the iterator has more elements */ + @Override boolean hasNext(); /** @@ -60,6 +61,7 @@ public interface MapIterator<K, V> extends Iterator<K> { * @return the next key in the iteration * @throws java.util.NoSuchElementException if the iteration is finished */ + @Override K next(); //----------------------------------------------------------------------- @@ -92,6 +94,7 @@ public interface MapIterator<K, V> extends Iterator<K> { * @throws IllegalStateException if <code>remove()</code> has already been called * since the last call to <code>next()</code> */ + @Override void remove(); /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/MultiMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/MultiMap.java b/src/main/java/org/apache/commons/collections4/MultiMap.java index aa58e3c..e77ef59 100644 --- a/src/main/java/org/apache/commons/collections4/MultiMap.java +++ b/src/main/java/org/apache/commons/collections4/MultiMap.java @@ -75,6 +75,7 @@ public interface MultiMap<K, V> extends IterableMap<K, Object> { * * @return the number of key-collection mappings in this map */ + @Override int size(); /** @@ -96,6 +97,7 @@ public interface MultiMap<K, V> extends IterableMap<K, Object> { * @throws ClassCastException if the key is of an invalid type * @throws NullPointerException if the key is null and null keys are invalid */ + @Override Object get(Object key); // Cannot use get(K key) as that does not properly implement Map#get /** @@ -109,6 +111,7 @@ public interface MultiMap<K, V> extends IterableMap<K, Object> { * @throws ClassCastException if the value is of an invalid type * @throws NullPointerException if the value is null and null value are invalid */ + @Override boolean containsValue(Object value); /** @@ -127,6 +130,7 @@ public interface MultiMap<K, V> extends IterableMap<K, Object> { * @throws NullPointerException if the key or value is null and null is invalid * @throws IllegalArgumentException if the key or value is invalid */ + @Override Object put(K key, Object value); /** @@ -142,6 +146,7 @@ public interface MultiMap<K, V> extends IterableMap<K, Object> { * @throws ClassCastException if the key is of an invalid type * @throws NullPointerException if the key is null and null keys are invalid */ + @Override Object remove(Object key); // Cannot use remove(K key) as that does not properly implement Map#remove /** @@ -153,6 +158,7 @@ public interface MultiMap<K, V> extends IterableMap<K, Object> { * * @return a collection view of the values contained in this map */ + @Override Collection<Object> values(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java b/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java index 9d46685..4ac89ba 100644 --- a/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java @@ -46,6 +46,7 @@ public interface OrderedBidiMap<K, V> extends BidiMap<K, V>, OrderedMap<K, V> { * * @return an inverted bidirectional map */ + @Override OrderedBidiMap<V, K> inverseBidiMap(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/OrderedMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/OrderedMap.java b/src/main/java/org/apache/commons/collections4/OrderedMap.java index 6fedf89..492b7c8 100644 --- a/src/main/java/org/apache/commons/collections4/OrderedMap.java +++ b/src/main/java/org/apache/commons/collections4/OrderedMap.java @@ -36,6 +36,7 @@ public interface OrderedMap<K, V> extends IterableMap<K, V> { * * @return a map iterator */ + @Override OrderedMapIterator<K, V> mapIterator(); /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java index 5f22f5d..23c747c 100644 --- a/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java +++ b/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java @@ -33,6 +33,7 @@ public interface OrderedMapIterator<K, V> extends MapIterator<K, V>, OrderedIter * * @return <code>true</code> if the iterator has a previous element */ + @Override boolean hasPrevious(); /** @@ -41,6 +42,7 @@ public interface OrderedMapIterator<K, V> extends MapIterator<K, V>, OrderedIter * @return the previous key in the iteration * @throws java.util.NoSuchElementException if the iteration is finished */ + @Override K previous(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/SortedBidiMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/SortedBidiMap.java b/src/main/java/org/apache/commons/collections4/SortedBidiMap.java index 8b71860..178090c 100644 --- a/src/main/java/org/apache/commons/collections4/SortedBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/SortedBidiMap.java @@ -48,6 +48,7 @@ public interface SortedBidiMap<K, V> extends OrderedBidiMap<K, V>, SortedMap<K, * * @return an inverted bidirectional map */ + @Override SortedBidiMap<V, K> inverseBidiMap(); /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/SplitMapUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/SplitMapUtils.java b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java index 7b27ed6..d6822df 100644 --- a/src/main/java/org/apache/commons/collections4/SplitMapUtils.java +++ b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java @@ -52,18 +52,22 @@ public class SplitMapUtils { this.get = get; } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public boolean containsKey(final Object key) { return get.containsKey(key); } + @Override public boolean containsValue(final Object value) { return get.containsValue(value); } + @Override public Set<Map.Entry<K, V>> entrySet() { return UnmodifiableEntrySet.unmodifiableEntrySet(get.entrySet()); } @@ -76,6 +80,7 @@ public class SplitMapUtils { return arg0 instanceof WrappedGet && ((WrappedGet<?, ?>) arg0).get.equals(this.get); } + @Override public V get(final Object key) { return get.get(key); } @@ -85,34 +90,42 @@ public class SplitMapUtils { return ("WrappedGet".hashCode() << 4) | get.hashCode(); } + @Override public boolean isEmpty() { return get.isEmpty(); } + @Override public Set<K> keySet() { return UnmodifiableSet.unmodifiableSet(get.keySet()); } + @Override public V put(final K key, final V value) { throw new UnsupportedOperationException(); } + @Override public void putAll(final Map<? extends K, ? extends V> t) { throw new UnsupportedOperationException(); } + @Override public V remove(final Object key) { return get.remove(key); } + @Override public int size() { return get.size(); } + @Override public Collection<V> values() { return UnmodifiableCollection.unmodifiableCollection(get.values()); } + @Override public MapIterator<K, V> mapIterator() { MapIterator<K, V> it; if (get instanceof IterableGet) { @@ -131,18 +144,22 @@ public class SplitMapUtils { this.put = put; } + @Override public void clear() { put.clear(); } + @Override public boolean containsKey(final Object key) { throw new UnsupportedOperationException(); } + @Override public boolean containsValue(final Object value) { throw new UnsupportedOperationException(); } + @Override public Set<Map.Entry<K, V>> entrySet() { throw new UnsupportedOperationException(); } @@ -155,6 +172,7 @@ public class SplitMapUtils { return obj instanceof WrappedPut && ((WrappedPut<?, ?>) obj).put.equals(this.put); } + @Override public V get(final Object key) { throw new UnsupportedOperationException(); } @@ -164,31 +182,38 @@ public class SplitMapUtils { return ("WrappedPut".hashCode() << 4) | put.hashCode(); } + @Override public boolean isEmpty() { throw new UnsupportedOperationException(); } + @Override public Set<K> keySet() { throw new UnsupportedOperationException(); } + @Override @SuppressWarnings("unchecked") public V put(final K key, final V value) { return (V) put.put(key, value); } + @Override public void putAll(final Map<? extends K, ? extends V> t) { put.putAll(t); } + @Override public V remove(final Object key) { throw new UnsupportedOperationException(); } + @Override public int size() { throw new UnsupportedOperationException(); } + @Override public Collection<V> values() { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java index d183161..3fdb0fd 100644 --- a/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java @@ -49,6 +49,7 @@ public abstract class AbstractQuantifierPredicate<T> implements PredicateDecorat * @return a copy of the predicates * @since 3.1 */ + @Override public Predicate<? super T>[] getPredicates() { return FunctorUtils.<T>copy(iPredicates); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java index 8345648..583e347 100644 --- a/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java @@ -103,6 +103,7 @@ public final class AllPredicate<T> extends AbstractQuantifierPredicate<T> { * @param object the input object * @return true if all decorated predicates return true */ + @Override public boolean evaluate(final T object) { for (final Predicate<? super T> iPredicate : iPredicates) { if (!iPredicate.evaluate(object)) { http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java index fa333e1..96b5ed8 100644 --- a/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java @@ -72,6 +72,7 @@ public final class AndPredicate<T> implements PredicateDecorator<T>, Serializabl * @param object the input object * @return true if both decorated predicates return true */ + @Override public boolean evaluate(final T object) { return iPredicate1.evaluate(object) && iPredicate2.evaluate(object); } @@ -82,6 +83,7 @@ public final class AndPredicate<T> implements PredicateDecorator<T>, Serializabl * @return the predicates * @since 3.1 */ + @Override @SuppressWarnings("unchecked") public Predicate<? super T>[] getPredicates() { return new Predicate[] {iPredicate1, iPredicate2}; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java index 1d825e6..95a0dd1 100644 --- a/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java @@ -100,6 +100,7 @@ public final class AnyPredicate<T> extends AbstractQuantifierPredicate<T> { * @param object the input object * @return true if any decorated predicate return true */ + @Override public boolean evaluate(final T object) { for (final Predicate<? super T> iPredicate : iPredicates) { if (iPredicate.evaluate(object)) { http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java b/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java index 05190e3..2270a68 100644 --- a/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java @@ -55,6 +55,7 @@ public abstract class CatchAndRethrowClosure<E> implements Closure<E> { * @throws FunctorException (runtime) if the closure execution resulted in a * checked exception. */ + @Override public void execute(final E input) { try { executeAndThrow(input); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java b/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java index 96497eb..326383c 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java @@ -107,6 +107,7 @@ public class ChainedClosure<E> implements Closure<E>, Serializable { * * @param input the input object passed to each closure */ + @Override public void execute(final E input) { for (final Closure<? super E> iClosure : iClosures) { iClosure.execute(input); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java index 0f925b2..1c07dfa 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java @@ -108,6 +108,7 @@ public class ChainedTransformer<T> implements Transformer<T, T>, Serializable { * @param object the input object passed to the first transformer * @return the transformed result */ + @Override public T transform(T object) { for (final Transformer<? super T, ? extends T> iTransformer : iTransformers) { object = iTransformer.transform(object); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java index fbe92b7..9e640e9 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java @@ -68,6 +68,7 @@ public class ClosureTransformer<T> implements Transformer<T, T>, Serializable { * @param input the input object to transform * @return the transformed result */ + @Override public T transform(final T input) { iClosure.execute(input); return input; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java b/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java index e6ea395..4c4a7ec 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java @@ -162,6 +162,7 @@ public class ComparatorPredicate<T> implements Predicate<T>, Serializable { * @return {@code true} if the comparison succeeds according to the selected criterion * @throws IllegalStateException if the criterion is invalid (really not possible) */ + @Override public boolean evaluate(final T target) { boolean result = false; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java b/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java index 76a4579..4a0f91a 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java +++ b/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java @@ -73,6 +73,7 @@ public class ConstantFactory<T> implements Factory<T>, Serializable { * * @return the stored constant value */ + @Override public T create() { return iConstant; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java index bc3c4d9..03fdc7b 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java @@ -86,6 +86,7 @@ public class ConstantTransformer<I, O> implements Transformer<I, O>, Serializabl * @param input the input object which is ignored * @return the stored constant */ + @Override public O transform(final I input) { return iConstant; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java b/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java index 1111e2e..d49db44 100644 --- a/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java +++ b/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java @@ -62,6 +62,7 @@ public class DefaultEquator<T> implements Equator<T>, Serializable { /** * {@inheritDoc} Delegates to {@link Object#equals(Object)}. */ + @Override public boolean equate(final T o1, final T o2) { return o1 == o2 || o1 != null && o1.equals(o2); } @@ -72,6 +73,7 @@ public class DefaultEquator<T> implements Equator<T>, Serializable { * @return <code>o.hashCode()</code> if <code>o</code> is non- * <code>null</code>, else {@link #HASHCODE_NULL}. */ + @Override public int hash(final T o) { return o == null ? HASHCODE_NULL : o.hashCode(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java b/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java index 813aec6..d4a51b0 100644 --- a/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java @@ -101,6 +101,7 @@ public final class EqualPredicate<T> implements Predicate<T>, Serializable { * @param object the input object * @return true if input object equals stored value */ + @Override public boolean evaluate(final T object) { if (equator != null) { return equator.equate(iValue, object); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java index 87bfbde..fa1bce8 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java @@ -61,6 +61,7 @@ public final class ExceptionClosure<E> implements Closure<E>, Serializable { * @param input the input object * @throws FunctorException always */ + @Override public void execute(final E input) { throw new FunctorException("ExceptionClosure invoked"); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java index 7889f92..fe71fa5 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java +++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java @@ -61,6 +61,7 @@ public final class ExceptionFactory<T> implements Factory<T>, Serializable { * @return never * @throws FunctorException always */ + @Override public T create() { throw new FunctorException("ExceptionFactory invoked"); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java index d899c4a..c5b668d 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java @@ -62,6 +62,7 @@ public final class ExceptionPredicate<T> implements Predicate<T>, Serializable { * @return never * @throws FunctorException always */ + @Override public boolean evaluate(final T object) { throw new FunctorException("ExceptionPredicate invoked"); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java index e7658a1..51269c7 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java @@ -63,6 +63,7 @@ public final class ExceptionTransformer<I, O> implements Transformer<I, O>, Seri * @return never * @throws FunctorException always */ + @Override public O transform(final I input) { throw new FunctorException("ExceptionTransformer invoked"); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java b/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java index b820707..cf8a5d1 100644 --- a/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java @@ -69,6 +69,7 @@ public class FactoryTransformer<I, O> implements Transformer<I, O>, Serializable * @param input the input object to transform * @return the transformed result */ + @Override public O transform(final I input) { return iFactory.create(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java b/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java index 0053793..388deee 100644 --- a/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java @@ -60,6 +60,7 @@ public final class FalsePredicate<T> implements Predicate<T>, Serializable { * @param object the input object * @return false always */ + @Override public boolean evaluate(final T object) { return false; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java b/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java index abb4645..369e5c9 100644 --- a/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java @@ -67,6 +67,7 @@ public final class IdentityPredicate<T> implements Predicate<T>, Serializable { * @param object the input object * @return true if input is the same object as the stored value */ + @Override public boolean evaluate(final T object) { return iValue == object; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/IfClosure.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/IfClosure.java b/src/main/java/org/apache/commons/collections4/functors/IfClosure.java index 19a5e60..895a766 100644 --- a/src/main/java/org/apache/commons/collections4/functors/IfClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/IfClosure.java @@ -115,6 +115,7 @@ public class IfClosure<E> implements Closure<E>, Serializable { * * @param input the input object */ + @Override public void execute(final E input) { if (iPredicate.evaluate(input)) { iTrueClosure.execute(input); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/IfTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/IfTransformer.java b/src/main/java/org/apache/commons/collections4/functors/IfTransformer.java index 431f3e0..933e53e 100644 --- a/src/main/java/org/apache/commons/collections4/functors/IfTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/IfTransformer.java @@ -117,6 +117,7 @@ public class IfTransformer<I, O> implements Transformer<I, O>, Serializable { * @param input the input object to transform * @return the transformed result */ + @Override public O transform(final I input) { if(iPredicate.evaluate(input)){ return iTrueTransformer.transform(input); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java b/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java index 6577d83..3976410 100644 --- a/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java @@ -66,6 +66,7 @@ public final class InstanceofPredicate implements Predicate<Object>, Serializabl * @param object the input object * @return true if input is of stored type */ + @Override public boolean evaluate(final Object object) { return iType.isInstance(object); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java b/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java index eb02a5c..cfcbc10 100644 --- a/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java @@ -70,6 +70,7 @@ public final class MapTransformer<I, O> implements Transformer<I, O>, Serializab * @param input the input object to transform * @return the transformed result */ + @Override public O transform(final I input) { return iMap.get(input); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java b/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java index de9447a..9e68898 100644 --- a/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java @@ -59,6 +59,7 @@ public final class NOPClosure<E> implements Closure<E>, Serializable { * * @param input the input object */ + @Override public void execute(final E input) { // do nothing } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java b/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java index 3d831eb..13e3fbe 100644 --- a/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java @@ -60,6 +60,7 @@ public class NOPTransformer<T> implements Transformer<T, T>, Serializable { * @param input the input object to transform * @return the transformed result which is the input */ + @Override public T transform(final T input) { return input; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java index 617f2e3..7539a57 100644 --- a/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java @@ -90,6 +90,7 @@ public final class NonePredicate<T> extends AbstractQuantifierPredicate<T> { * @param object the input object * @return true if none of decorated predicates return true */ + @Override public boolean evaluate(final T object) { for (final Predicate<? super T> iPredicate : iPredicates) { if (iPredicate.evaluate(object)) { http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java index 5697cfb..f06b275 100644 --- a/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java @@ -60,6 +60,7 @@ public final class NotNullPredicate<T> implements Predicate<T>, Serializable { * @param object the object to evaluate * @return true if not null */ + @Override public boolean evaluate(final T object) { return object != null; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java index b9876a0..bd3f257 100644 --- a/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java @@ -66,6 +66,7 @@ public final class NotPredicate<T> implements PredicateDecorator<T>, Serializabl * @param object the input object * @return true if predicate returns false */ + @Override public boolean evaluate(final T object) { return !iPredicate.evaluate(object); } @@ -76,6 +77,7 @@ public final class NotPredicate<T> implements PredicateDecorator<T>, Serializabl * @return the predicate as the only element in an array * @since 3.1 */ + @Override @SuppressWarnings("unchecked") public Predicate<? super T>[] getPredicates() { return new Predicate[] {iPredicate}; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java index aa090ee..8fdba9b 100644 --- a/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java @@ -69,6 +69,7 @@ public final class NullIsExceptionPredicate<T> implements PredicateDecorator<T>, * @return true if decorated predicate returns true * @throws FunctorException if input is null */ + @Override public boolean evaluate(final T object) { if (object == null) { throw new FunctorException("Input Object must not be null"); @@ -82,6 +83,7 @@ public final class NullIsExceptionPredicate<T> implements PredicateDecorator<T>, * @return the predicate as the only element in an array * @since 3.1 */ + @Override @SuppressWarnings("unchecked") public Predicate<? super T>[] getPredicates() { return new Predicate[] { iPredicate }; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java index c24878b..20195c1 100644 --- a/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java @@ -67,6 +67,7 @@ public final class NullIsFalsePredicate<T> implements PredicateDecorator<T>, Ser * @param object the input object * @return true if decorated predicate returns true, false if input is null */ + @Override public boolean evaluate(final T object) { if (object == null) { return false; @@ -80,6 +81,7 @@ public final class NullIsFalsePredicate<T> implements PredicateDecorator<T>, Ser * @return the predicate as the only element in an array * @since 3.1 */ + @Override @SuppressWarnings("unchecked") public Predicate<? super T>[] getPredicates() { return new Predicate[] { iPredicate }; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java index 1eac13f..34ce9c2 100644 --- a/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java @@ -67,6 +67,7 @@ public final class NullIsTruePredicate<T> implements PredicateDecorator<T>, Seri * @param object the input object * @return true if decorated predicate returns true or input is null */ + @Override public boolean evaluate(final T object) { if (object == null) { return true; @@ -80,6 +81,7 @@ public final class NullIsTruePredicate<T> implements PredicateDecorator<T>, Seri * @return the predicate as the only element in an array * @since 3.1 */ + @Override @SuppressWarnings("unchecked") public Predicate<? super T>[] getPredicates() { return new Predicate[] { iPredicate }; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java index 097b431..354b04c 100644 --- a/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java @@ -60,6 +60,7 @@ public final class NullPredicate<T> implements Predicate<T>, Serializable { * @param object the input object * @return true if input is null */ + @Override public boolean evaluate(final T object) { return object == null; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java b/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java index c4588d5..cb829f0 100644 --- a/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java @@ -91,6 +91,7 @@ public final class OnePredicate<T> extends AbstractQuantifierPredicate<T> { * @param object the input object * @return true if only one decorated predicate returns true */ + @Override public boolean evaluate(final T object) { boolean match = false; for (final Predicate<? super T> iPredicate : iPredicates) { http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java b/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java index dcd1992..6078191 100644 --- a/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java @@ -72,6 +72,7 @@ public final class OrPredicate<T> implements PredicateDecorator<T>, Serializable * @param object the input object * @return true if either decorated predicate returns true */ + @Override public boolean evaluate(final T object) { return iPredicate1.evaluate(object) || iPredicate2.evaluate(object); } @@ -82,6 +83,7 @@ public final class OrPredicate<T> implements PredicateDecorator<T>, Serializable * @return the predicates * @since 3.1 */ + @Override @SuppressWarnings("unchecked") public Predicate<? super T>[] getPredicates() { return new Predicate[] {iPredicate1, iPredicate2}; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java b/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java index 61c6325..5abda00 100644 --- a/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java @@ -68,6 +68,7 @@ public class PredicateTransformer<T> implements Transformer<T, Boolean>, Seriali * @param input the input object to transform * @return the transformed result */ + @Override public Boolean transform(final T input) { return Boolean.valueOf(iPredicate.evaluate(input)); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java b/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java index 078f53f..3749db1 100644 --- a/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java @@ -60,6 +60,7 @@ public final class StringValueTransformer<T> implements Transformer<T, String>, * @param input the input object to transform * @return the transformed result */ + @Override public String transform(final T input) { return String.valueOf(input); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java b/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java index de6e544..39fe371 100644 --- a/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java @@ -143,6 +143,7 @@ public class SwitchClosure<E> implements Closure<E>, Serializable { * * @param input the input object */ + @Override public void execute(final E input) { for (int i = 0; i < iPredicates.length; i++) { if (iPredicates[i].evaluate(input) == true) { http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java index defc3fe..6d8c97a 100644 --- a/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java @@ -157,6 +157,7 @@ public class SwitchTransformer<I, O> implements Transformer<I, O>, Serializable * @param input the input object to transform * @return the transformed result */ + @Override public O transform(final I input) { for (int i = 0; i < iPredicates.length; i++) { if (iPredicates[i].evaluate(input) == true) { http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java b/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java index 2278a26..c91e8df 100644 --- a/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java @@ -79,6 +79,7 @@ public final class TransformedPredicate<T> implements PredicateDecorator<T>, Ser * @param object the input object which will be transformed * @return true if decorated predicate returns true */ + @Override public boolean evaluate(final T object) { final T result = iTransformer.transform(object); return iPredicate.evaluate(result); @@ -90,6 +91,7 @@ public final class TransformedPredicate<T> implements PredicateDecorator<T>, Ser * @return the predicate as the only element in an array * @since 3.1 */ + @Override @SuppressWarnings("unchecked") public Predicate<? super T>[] getPredicates() { return new Predicate[] {iPredicate}; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java b/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java index f3430ec..f75e9c6 100644 --- a/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java @@ -68,6 +68,7 @@ public class TransformerClosure<E> implements Closure<E>, Serializable { * * @param input the input object */ + @Override public void execute(final E input) { iTransformer.transform(input); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java b/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java index c3b03a2..f5ed6ba 100644 --- a/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java @@ -69,6 +69,7 @@ public final class TransformerPredicate<T> implements Predicate<T>, Serializable * @return true if decorated transformer returns Boolean.TRUE * @throws FunctorException if the transformer returns an invalid type */ + @Override public boolean evaluate(final T object) { final Boolean result = iTransformer.transform(object); if (result == null) { http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java b/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java index 61b6563..fb56a91 100644 --- a/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java @@ -60,6 +60,7 @@ public final class TruePredicate<T> implements Predicate<T>, Serializable { * @param object the input object * @return true always */ + @Override public boolean evaluate(final T object) { return true; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java b/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java index fa64339..50528ad 100644 --- a/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java +++ b/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java @@ -63,6 +63,7 @@ public final class UniquePredicate<T> implements Predicate<T>, Serializable { * @param object the input object * @return true if this is the first time the object is seen */ + @Override public boolean evaluate(final T object) { return iSet.add(object); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java index 5aa7117..8f2e6bc 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java @@ -40,6 +40,7 @@ public abstract class AbstractIteratorDecorator<E> extends AbstractUntypedIterat } /** {@inheritDoc} */ + @Override public E next() { return getIterator().next(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java index f380383..cefe7c7 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java @@ -58,46 +58,55 @@ public class AbstractListIteratorDecorator<E> implements ListIterator<E> { //----------------------------------------------------------------------- /** {@inheritDoc} */ + @Override public boolean hasNext() { return iterator.hasNext(); } /** {@inheritDoc} */ + @Override public E next() { return iterator.next(); } /** {@inheritDoc} */ + @Override public int nextIndex() { return iterator.nextIndex(); } /** {@inheritDoc} */ + @Override public boolean hasPrevious() { return iterator.hasPrevious(); } /** {@inheritDoc} */ + @Override public E previous() { return iterator.previous(); } /** {@inheritDoc} */ + @Override public int previousIndex() { return iterator.previousIndex(); } /** {@inheritDoc} */ + @Override public void remove() { iterator.remove(); } /** {@inheritDoc} */ + @Override public void set(final E obj) { iterator.set(obj); } /** {@inheritDoc} */ + @Override public void add(final E obj) { iterator.add(obj); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java index 34d23f9..13343e8 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java @@ -58,31 +58,37 @@ public class AbstractMapIteratorDecorator<K, V> implements MapIterator<K, V> { //----------------------------------------------------------------------- /** {@inheritDoc} */ + @Override public boolean hasNext() { return iterator.hasNext(); } /** {@inheritDoc} */ + @Override public K next() { return iterator.next(); } /** {@inheritDoc} */ + @Override public void remove() { iterator.remove(); } /** {@inheritDoc} */ + @Override public K getKey() { return iterator.getKey(); } /** {@inheritDoc} */ + @Override public V getValue() { return iterator.getValue(); } /** {@inheritDoc} */ + @Override public V setValue(final V obj) { return iterator.setValue(obj); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java index 2118b8e..c934f46 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java @@ -58,41 +58,49 @@ public class AbstractOrderedMapIteratorDecorator<K, V> implements OrderedMapIter //----------------------------------------------------------------------- /** {@inheritDoc} */ + @Override public boolean hasNext() { return iterator.hasNext(); } /** {@inheritDoc} */ + @Override public K next() { return iterator.next(); } /** {@inheritDoc} */ + @Override public boolean hasPrevious() { return iterator.hasPrevious(); } /** {@inheritDoc} */ + @Override public K previous() { return iterator.previous(); } /** {@inheritDoc} */ + @Override public void remove() { iterator.remove(); } /** {@inheritDoc} */ + @Override public K getKey() { return iterator.getKey(); } /** {@inheritDoc} */ + @Override public V getValue() { return iterator.getValue(); } /** {@inheritDoc} */ + @Override public V setValue(final V obj) { return iterator.setValue(obj); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java index 250bf2a..200e7b7 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java @@ -55,10 +55,12 @@ public abstract class AbstractUntypedIteratorDecorator<I, O> implements Iterator return iterator; } + @Override public boolean hasNext() { return iterator.hasNext(); } + @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/ArrayIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java index a7bc59e..34eccec 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java @@ -131,6 +131,7 @@ public class ArrayIterator<E> implements ResettableIterator<E> { * * @return true if there is a next element to return */ + @Override public boolean hasNext() { return index < endIndex; } @@ -142,6 +143,7 @@ public class ArrayIterator<E> implements ResettableIterator<E> { * @throws NoSuchElementException if all the elements in the array * have already been returned */ + @Override @SuppressWarnings("unchecked") public E next() { if (hasNext() == false) { @@ -155,6 +157,7 @@ public class ArrayIterator<E> implements ResettableIterator<E> { * * @throws UnsupportedOperationException always */ + @Override public void remove() { throw new UnsupportedOperationException("remove() method is not supported"); } @@ -193,6 +196,7 @@ public class ArrayIterator<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/ArrayListIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java index 56f33e4..b5307d6 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java @@ -101,6 +101,7 @@ public class ArrayListIterator<E> extends ArrayIterator<E> * * @return true if there is a previous element to return */ + @Override public boolean hasPrevious() { return this.index > this.startIndex; } @@ -111,6 +112,7 @@ public class ArrayListIterator<E> extends ArrayIterator<E> * @return the previous element * @throws NoSuchElementException if there is no previous element */ + @Override @SuppressWarnings("unchecked") public E previous() { if (hasPrevious() == false) { @@ -141,6 +143,7 @@ public class ArrayListIterator<E> extends ArrayIterator<E> * * @return the index of the item to be retrieved next */ + @Override public int nextIndex() { return this.index - this.startIndex; } @@ -150,6 +153,7 @@ public class ArrayListIterator<E> extends ArrayIterator<E> * * @return the index of the item to be retrieved next */ + @Override public int previousIndex() { return this.index - this.startIndex - 1; } @@ -162,6 +166,7 @@ public class ArrayListIterator<E> extends ArrayIterator<E> * @throws UnsupportedOperationException always thrown. * @see java.util.ListIterator#set */ + @Override public void add(final Object o) { throw new UnsupportedOperationException("add() method is not supported"); } @@ -184,6 +189,7 @@ public class ArrayListIterator<E> extends ArrayIterator<E> * before {@link #set(Object)} * @see java.util.ListIterator#set */ + @Override public void set(final Object o) { 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/BoundedIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/BoundedIterator.java b/src/main/java/org/apache/commons/collections4/iterators/BoundedIterator.java index 8a5025c..06aaeff 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/BoundedIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/BoundedIterator.java @@ -90,6 +90,7 @@ public class BoundedIterator<E> implements Iterator<E> { //----------------------------------------------------------------------- + @Override public boolean hasNext() { if (!checkBounds()) { return false; @@ -108,6 +109,7 @@ public class BoundedIterator<E> implements Iterator<E> { return true; } + @Override public E next() { if (!checkBounds()) { throw new NoSuchElementException(); @@ -125,6 +127,7 @@ public class BoundedIterator<E> implements Iterator<E> { * {@link IllegalStateException} if no explicit call to {@link #next()} has been made prior * to calling {@link #remove()}. */ + @Override public void remove() { if (pos <= offset) { throw new IllegalStateException("remove() can not be called before calling next()"); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java index e699d60..3e5aebb 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java @@ -227,6 +227,7 @@ public class CollatingIterator<E> implements Iterator<E> { * * @return true if this iterator has remaining elements */ + @Override public boolean hasNext() { start(); return anyValueSet(valueSet) || anyHasNext(iterators); @@ -238,6 +239,7 @@ public class CollatingIterator<E> implements Iterator<E> { * @return the next ordered element * @throws NoSuchElementException if no child iterator has any more elements */ + @Override public E next() throws NoSuchElementException { if (hasNext() == false) { throw new NoSuchElementException(); @@ -258,6 +260,7 @@ public class CollatingIterator<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 == -1) { 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/iterators/EntrySetMapIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java index fc3841b..7a17f6c 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java @@ -61,6 +61,7 @@ public class EntrySetMapIterator<K, V> implements MapIterator<K, V>, ResettableI * * @return <code>true</code> if the iterator has more elements */ + @Override public boolean hasNext() { return iterator.hasNext(); } @@ -71,6 +72,7 @@ public class EntrySetMapIterator<K, V> implements MapIterator<K, V>, ResettableI * @return the next key in the iteration * @throws java.util.NoSuchElementException if the iteration is finished */ + @Override public K next() { last = iterator.next(); canRemove = true; @@ -88,6 +90,7 @@ public class EntrySetMapIterator<K, V> implements MapIterator<K, V>, ResettableI * @throws IllegalStateException if <code>remove()</code> has already been called * since the last call to <code>next()</code> */ + @Override public void remove() { if (canRemove == false) { throw new IllegalStateException("Iterator remove() can only be called once after next()"); @@ -105,6 +108,7 @@ public class EntrySetMapIterator<K, V> implements MapIterator<K, V>, ResettableI * @return the current key * @throws IllegalStateException if <code>next()</code> has not yet been called */ + @Override public K getKey() { if (last == null) { throw new IllegalStateException("Iterator getKey() can only be called after next() and before remove()"); @@ -119,6 +123,7 @@ public class EntrySetMapIterator<K, V> implements MapIterator<K, V>, ResettableI * @return the current value * @throws IllegalStateException if <code>next()</code> has not yet been called */ + @Override public V getValue() { if (last == null) { throw new IllegalStateException("Iterator getValue() can only be called after next() and before remove()"); @@ -136,6 +141,7 @@ public class EntrySetMapIterator<K, V> implements MapIterator<K, V>, ResettableI * @throws IllegalStateException if <code>remove()</code> has been called since the * last call to <code>next()</code> */ + @Override public V setValue(final V value) { if (last == null) { throw new IllegalStateException("Iterator setValue() can only be called after next() and before remove()"); @@ -147,6 +153,7 @@ public class EntrySetMapIterator<K, V> implements MapIterator<K, V>, ResettableI /** * Resets the state of the iterator. */ + @Override public void reset() { iterator = map.entrySet().iterator(); last = null;
