You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2015/06/06 22:19:04 UTC
svn commit: r1683951 - in
/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4:
bag/ bidimap/ collection/ comparators/
Author: tn
Date: Sat Jun 6 20:19:03 2015
New Revision: 1683951
URL: http://svn.apache.org/r1683951
Log:
Add missing @Override tags.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/HashBag.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/TreeBag.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java Sat Jun 6 20:19:03 2015
@@ -75,18 +75,22 @@ public abstract class AbstractBagDecorat
//-----------------------------------------------------------------------
+ @Override
public int getCount(final Object object) {
return decorated().getCount(object);
}
+ @Override
public boolean add(final E object, final int count) {
return decorated().add(object, count);
}
+ @Override
public boolean remove(final Object object, final int count) {
return decorated().remove(object, count);
}
+ @Override
public Set<E> uniqueSet() {
return decorated().uniqueSet();
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java Sat Jun 6 20:19:03 2015
@@ -27,8 +27,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import org.apache.commons.collections4.set.UnmodifiableSet;
import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.set.UnmodifiableSet;
/**
* Abstract implementation of the {@link Bag} interface to simplify the creation
@@ -86,6 +86,7 @@ public abstract class AbstractMapBag<E>
*
* @return current size of the bag
*/
+ @Override
public int size() {
return size;
}
@@ -95,6 +96,7 @@ public abstract class AbstractMapBag<E>
*
* @return true if bag is empty
*/
+ @Override
public boolean isEmpty() {
return map.isEmpty();
}
@@ -106,6 +108,7 @@ public abstract class AbstractMapBag<E>
* @param object the object to search for
* @return the number of occurrences of the object, zero if not found
*/
+ @Override
public int getCount(final Object object) {
final MutableInteger count = map.get(object);
if (count != null) {
@@ -122,6 +125,7 @@ public abstract class AbstractMapBag<E>
* @param object the object to search for
* @return true if the bag contains the given element
*/
+ @Override
public boolean contains(final Object object) {
return map.containsKey(object);
}
@@ -132,6 +136,7 @@ public abstract class AbstractMapBag<E>
* @param coll the collection to check against
* @return <code>true</code> if the Bag contains all the collection
*/
+ @Override
public boolean containsAll(final Collection<?> coll) {
if (coll instanceof Bag) {
return containsAll((Bag<?>) coll);
@@ -164,6 +169,7 @@ public abstract class AbstractMapBag<E>
*
* @return the iterator
*/
+ @Override
public Iterator<E> iterator() {
return new BagIterator<E>(this);
}
@@ -193,11 +199,13 @@ public abstract class AbstractMapBag<E>
}
/** {@inheritDoc} */
+ @Override
public boolean hasNext() {
return itemCount > 0 || entryIterator.hasNext();
}
/** {@inheritDoc} */
+ @Override
public E next() {
if (parent.modCount != mods) {
throw new ConcurrentModificationException();
@@ -212,6 +220,7 @@ public abstract class AbstractMapBag<E>
}
/** {@inheritDoc} */
+ @Override
public void remove() {
if (parent.modCount != mods) {
throw new ConcurrentModificationException();
@@ -237,6 +246,7 @@ public abstract class AbstractMapBag<E>
* @param object the object to add
* @return <code>true</code> if the object was not already in the <code>uniqueSet</code>
*/
+ @Override
public boolean add(final E object) {
return add(object, 1);
}
@@ -248,6 +258,7 @@ public abstract class AbstractMapBag<E>
* @param nCopies the number of copies to add
* @return <code>true</code> if the object was not already in the <code>uniqueSet</code>
*/
+ @Override
public boolean add(final E object, final int nCopies) {
modCount++;
if (nCopies > 0) {
@@ -269,6 +280,7 @@ public abstract class AbstractMapBag<E>
* @param coll the collection to add
* @return <code>true</code> if this call changed the bag
*/
+ @Override
public boolean addAll(final Collection<? extends E> coll) {
boolean changed = false;
final Iterator<? extends E> i = coll.iterator();
@@ -283,6 +295,7 @@ public abstract class AbstractMapBag<E>
/**
* Clears the bag by clearing the underlying map.
*/
+ @Override
public void clear() {
modCount++;
map.clear();
@@ -295,6 +308,7 @@ public abstract class AbstractMapBag<E>
* @param object the object to remove
* @return true if the bag changed
*/
+ @Override
public boolean remove(final Object object) {
final MutableInteger mut = map.get(object);
if (mut == null) {
@@ -313,6 +327,7 @@ public abstract class AbstractMapBag<E>
* @param nCopies the number of copies to remove
* @return true if the bag changed
*/
+ @Override
public boolean remove(final Object object, final int nCopies) {
final MutableInteger mut = map.get(object);
if (mut == null) {
@@ -339,6 +354,7 @@ public abstract class AbstractMapBag<E>
* @param coll the collection to use
* @return true if the bag changed
*/
+ @Override
public boolean removeAll(final Collection<?> coll) {
boolean result = false;
if (coll != null) {
@@ -358,6 +374,7 @@ public abstract class AbstractMapBag<E>
* @param coll the collection to retain
* @return true if this call changed the collection
*/
+ @Override
public boolean retainAll(final Collection<?> coll) {
if (coll instanceof Bag) {
return retainAll((Bag<?>) coll);
@@ -429,6 +446,7 @@ public abstract class AbstractMapBag<E>
*
* @return an array of all of this bag's elements
*/
+ @Override
public Object[] toArray() {
final Object[] result = new Object[size()];
int i = 0;
@@ -454,6 +472,7 @@ public abstract class AbstractMapBag<E>
* a supertype of the runtime type of the elements in this list
* @throws NullPointerException if the specified array is null
*/
+ @Override
public <T> T[] toArray(T[] array) {
final int size = size();
if (array.length < size) {
@@ -484,6 +503,7 @@ public abstract class AbstractMapBag<E>
*
* @return the set of unique elements in this bag
*/
+ @Override
public Set<E> uniqueSet() {
if (uniqueSet == null) {
uniqueSet = UnmodifiableSet.<E> unmodifiableSet(map.keySet());
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java Sat Jun 6 20:19:03 2015
@@ -64,14 +64,17 @@ public abstract class AbstractSortedBagD
//-----------------------------------------------------------------------
+ @Override
public E first() {
return decorated().first();
}
+ @Override
public E last() {
return decorated().last();
}
+ @Override
public Comparator<? super E> comparator() {
return decorated().comparator();
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/HashBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/HashBag.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/HashBag.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/HashBag.java Sat Jun 6 20:19:03 2015
@@ -23,6 +23,8 @@ import java.io.Serializable;
import java.util.Collection;
import java.util.HashMap;
+import org.apache.commons.collections4.Bag;
+
/**
* Implements {@link Bag}, using a {@link HashMap} to provide the
* data storage. This is the standard implementation of a bag.
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java Sat Jun 6 20:19:03 2015
@@ -31,7 +31,9 @@ import org.apache.commons.collections4.c
* If an object cannot be added to the bag, an {@link IllegalArgumentException} is thrown.
* <p>
* One usage would be to ensure that no null entries are added to the bag.
- * <pre>Bag bag = PredicatedBag.decorate(new HashBag(), NotNullPredicate.INSTANCE);</pre>
+ * <pre>
+ * Bag bag = PredicatedBag.predicatedBag(new HashBag(), NotNullPredicate.INSTANCE);
+ * </pre>
* <p>
* This class is Serializable from Commons Collections 3.1.
*
@@ -99,19 +101,23 @@ public class PredicatedBag<E> extends Pr
//-----------------------------------------------------------------------
+ @Override
public boolean add(final E object, final int count) {
validate(object);
return decorated().add(object, count);
}
+ @Override
public boolean remove(final Object object, final int count) {
return decorated().remove(object, count);
}
+ @Override
public Set<E> uniqueSet() {
return decorated().uniqueSet();
}
+ @Override
public int getCount(final Object object) {
return decorated().getCount(object);
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java Sat Jun 6 20:19:03 2015
@@ -30,7 +30,9 @@ import org.apache.commons.collections4.S
* If an object cannot be added to the bag, an {@link IllegalArgumentException} is thrown.
* <p>
* One usage would be to ensure that no null entries are added to the bag.
- * <pre>SortedBag bag = PredicatedSortedBag.decorate(new TreeBag(), NotNullPredicate.INSTANCE);</pre>
+ * <pre>
+ * SortedBag bag = PredicatedSortedBag.predicatedSortedBag(new TreeBag(), NotNullPredicate.INSTANCE);
+ * </pre>
* <p>
* This class is Serializable from Commons Collections 3.1.
*
@@ -88,14 +90,17 @@ public class PredicatedSortedBag<E> exte
//-----------------------------------------------------------------------
+ @Override
public E first() {
return decorated().first();
}
+ @Override
public E last() {
return decorated().last();
}
+ @Override
public Comparator<? super E> comparator() {
return decorated().comparator();
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java Sat Jun 6 20:19:03 2015
@@ -101,18 +101,21 @@ public class SynchronizedBag<E> extends
//-----------------------------------------------------------------------
+ @Override
public boolean add(final E object, final int count) {
synchronized (lock) {
return getBag().add(object, count);
}
}
+ @Override
public boolean remove(final Object object, final int count) {
synchronized (lock) {
return getBag().remove(object, count);
}
}
+ @Override
public Set<E> uniqueSet() {
synchronized (lock) {
final Set<E> set = getBag().uniqueSet();
@@ -120,6 +123,7 @@ public class SynchronizedBag<E> extends
}
}
+ @Override
public int getCount(final Object object) {
synchronized (lock) {
return getBag().getCount(object);
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java Sat Jun 6 20:19:03 2015
@@ -84,18 +84,21 @@ public class SynchronizedSortedBag<E> ex
//-----------------------------------------------------------------------
+ @Override
public synchronized E first() {
synchronized (lock) {
return getSortedBag().first();
}
}
+ @Override
public synchronized E last() {
synchronized (lock) {
return getSortedBag().last();
}
}
+ @Override
public synchronized Comparator<? super E> comparator() {
synchronized (lock) {
return getSortedBag().comparator();
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java Sat Jun 6 20:19:03 2015
@@ -122,20 +122,24 @@ public class TransformedBag<E> extends T
//-----------------------------------------------------------------------
+ @Override
public int getCount(final Object object) {
return getBag().getCount(object);
}
+ @Override
public boolean remove(final Object object, final int nCopies) {
return getBag().remove(object, nCopies);
}
//-----------------------------------------------------------------------
+ @Override
public boolean add(final E object, final int nCopies) {
return getBag().add(transform(object), nCopies);
}
+ @Override
public Set<E> uniqueSet() {
final Set<E> set = getBag().uniqueSet();
return TransformedSet.<E>transformingSet(set, transformer);
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java Sat Jun 6 20:19:03 2015
@@ -113,14 +113,17 @@ public class TransformedSortedBag<E> ext
//-----------------------------------------------------------------------
+ @Override
public E first() {
return getSortedBag().first();
}
+ @Override
public E last() {
return getSortedBag().last();
}
+ @Override
public Comparator<? super E> comparator() {
return getSortedBag().comparator();
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/TreeBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/TreeBag.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/TreeBag.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/TreeBag.java Sat Jun 6 20:19:03 2015
@@ -97,14 +97,17 @@ public class TreeBag<E> extends Abstract
//-----------------------------------------------------------------------
+ @Override
public E first() {
return getMap().firstKey();
}
+ @Override
public E last() {
return getMap().lastKey();
}
+ @Override
public Comparator<? super E> comparator() {
return getMap().comparator();
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java Sat Jun 6 20:19:03 2015
@@ -66,14 +66,17 @@ public abstract class AbstractBidiMapDec
return decorated().mapIterator();
}
+ @Override
public K getKey(final Object value) {
return decorated().getKey(value);
}
+ @Override
public K removeValue(final Object value) {
return decorated().removeValue(value);
}
+ @Override
public BidiMap<V, K> inverseBidiMap() {
return decorated().inverseBidiMap();
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java Sat Jun 6 20:19:03 2015
@@ -131,18 +131,22 @@ public abstract class AbstractDualBidiMa
// Map delegation
//-----------------------------------------------------------------------
+ @Override
public V get(final Object key) {
return normalMap.get(key);
}
+ @Override
public int size() {
return normalMap.size();
}
+ @Override
public boolean isEmpty() {
return normalMap.isEmpty();
}
+ @Override
public boolean containsKey(final Object key) {
return normalMap.containsKey(key);
}
@@ -165,6 +169,7 @@ public abstract class AbstractDualBidiMa
// BidiMap changes
//-----------------------------------------------------------------------
+ @Override
public V put(final K key, final V value) {
if (normalMap.containsKey(key)) {
reverseMap.remove(normalMap.get(key));
@@ -177,12 +182,14 @@ public abstract class AbstractDualBidiMa
return obj;
}
+ @Override
public void putAll(final Map<? extends K, ? extends V> map) {
for (final Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
put(entry.getKey(), entry.getValue());
}
}
+ @Override
public V remove(final Object key) {
V value = null;
if (normalMap.containsKey(key)) {
@@ -192,11 +199,13 @@ public abstract class AbstractDualBidiMa
return value;
}
+ @Override
public void clear() {
normalMap.clear();
reverseMap.clear();
}
+ @Override
public boolean containsValue(final Object value) {
return reverseMap.containsKey(value);
}
@@ -214,14 +223,17 @@ public abstract class AbstractDualBidiMa
*
* @return a map iterator
*/
+ @Override
public MapIterator<K, V> mapIterator() {
return new BidiMapIterator<K, V>(this);
}
+ @Override
public K getKey(final Object value) {
return reverseMap.get(value);
}
+ @Override
public K removeValue(final Object value) {
K key = null;
if (reverseMap.containsKey(value)) {
@@ -231,6 +243,7 @@ public abstract class AbstractDualBidiMa
return key;
}
+ @Override
public BidiMap<V, K> inverseBidiMap() {
if (inverseBidiMap == null) {
inverseBidiMap = createBidiMap(reverseMap, normalMap, this);
@@ -247,6 +260,7 @@ public abstract class AbstractDualBidiMa
*
* @return the keySet view
*/
+ @Override
public Set<K> keySet() {
if (keySet == null) {
keySet = new KeySet<K>(this);
@@ -272,6 +286,7 @@ public abstract class AbstractDualBidiMa
*
* @return the values view
*/
+ @Override
public Set<V> values() {
if (values == null) {
values = new Values<V>(this);
@@ -301,6 +316,7 @@ public abstract class AbstractDualBidiMa
*
* @return the entrySet view
*/
+ @Override
public Set<Map.Entry<K, V>> entrySet() {
if (entrySet == null) {
entrySet = new EntrySet<K, V>(this);
@@ -713,16 +729,19 @@ public abstract class AbstractDualBidiMa
this.iterator = parent.normalMap.entrySet().iterator();
}
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
public K next() {
last = iterator.next();
canRemove = true;
return last.getKey();
}
+ @Override
public void remove() {
if (canRemove == false) {
throw new IllegalStateException("Iterator remove() can only be called once after next()");
@@ -735,6 +754,7 @@ public abstract class AbstractDualBidiMa
canRemove = false;
}
+ @Override
public K getKey() {
if (last == null) {
throw new IllegalStateException(
@@ -743,6 +763,7 @@ public abstract class AbstractDualBidiMa
return last.getKey();
}
+ @Override
public V getValue() {
if (last == null) {
throw new IllegalStateException(
@@ -751,6 +772,7 @@ public abstract class AbstractDualBidiMa
return last.getValue();
}
+ @Override
public V setValue(final V value) {
if (last == null) {
throw new IllegalStateException(
@@ -764,6 +786,7 @@ public abstract class AbstractDualBidiMa
return parent.put(last.getKey(), value);
}
+ @Override
public void reset() {
iterator = parent.normalMap.entrySet().iterator();
last = null;
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java Sat Jun 6 20:19:03 2015
@@ -64,18 +64,22 @@ public abstract class AbstractOrderedBid
return decorated().mapIterator();
}
+ @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);
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java Sat Jun 6 20:19:03 2015
@@ -65,22 +65,27 @@ public abstract class AbstractSortedBidi
return decorated().inverseBidiMap();
}
+ @Override
public Comparator<? super K> comparator() {
return decorated().comparator();
}
+ @Override
public Comparator<? super V> valueComparator() {
return decorated().valueComparator();
}
+ @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);
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java Sat Jun 6 20:19:03 2015
@@ -128,22 +128,27 @@ public class DualTreeBidiMap<K, V> exten
//-----------------------------------------------------------------------
+ @Override
public Comparator<? super K> comparator() {
return ((SortedMap<K, V>) normalMap).comparator();
}
+ @Override
public Comparator<? super V> valueComparator() {
return ((SortedMap<V, K>) reverseMap).comparator();
}
+ @Override
public K firstKey() {
return ((SortedMap<K, V>) normalMap).firstKey();
}
+ @Override
public K lastKey() {
return ((SortedMap<K, V>) normalMap).lastKey();
}
+ @Override
public K nextKey(final K key) {
if (isEmpty()) {
return null;
@@ -160,6 +165,7 @@ public class DualTreeBidiMap<K, V> exten
return null;
}
+ @Override
public K previousKey(final K key) {
if (isEmpty()) {
return null;
@@ -199,16 +205,19 @@ public class DualTreeBidiMap<K, V> exten
//-----------------------------------------------------------------------
+ @Override
public SortedMap<K, V> headMap(final K toKey) {
final SortedMap<K, V> sub = ((SortedMap<K, V>) normalMap).headMap(toKey);
return new ViewMap<K, V>(this, sub);
}
+ @Override
public SortedMap<K, V> tailMap(final K fromKey) {
final SortedMap<K, V> sub = ((SortedMap<K, V>) normalMap).tailMap(fromKey);
return new ViewMap<K, V>(this, sub);
}
+ @Override
public SortedMap<K, V> subMap(final K fromKey, final K toKey) {
final SortedMap<K, V> sub = ((SortedMap<K, V>) normalMap).subMap(fromKey, toKey);
return new ViewMap<K, V>(this, sub);
@@ -307,30 +316,36 @@ public class DualTreeBidiMap<K, V> exten
iterator = new ArrayList<Map.Entry<K, V>>(parent.entrySet()).listIterator();
}
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
public K next() {
last = iterator.next();
return last.getKey();
}
+ @Override
public boolean hasPrevious() {
return iterator.hasPrevious();
}
+ @Override
public K previous() {
last = iterator.previous();
return last.getKey();
}
+ @Override
public void remove() {
iterator.remove();
parent.remove(last.getKey());
last = null;
}
+ @Override
public K getKey() {
if (last == null) {
throw new IllegalStateException(
@@ -339,6 +354,7 @@ public class DualTreeBidiMap<K, V> exten
return last.getKey();
}
+ @Override
public V getValue() {
if (last == null) {
throw new IllegalStateException(
@@ -347,6 +363,7 @@ public class DualTreeBidiMap<K, V> exten
return last.getValue();
}
+ @Override
public V setValue(final V value) {
if (last == null) {
throw new IllegalStateException(
@@ -365,6 +382,7 @@ public class DualTreeBidiMap<K, V> exten
return oldValue;
}
+ @Override
public void reset() {
iterator = new ArrayList<Map.Entry<K, V>>(parent.entrySet()).listIterator();
last = null;
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java Sat Jun 6 20:19:03 2015
@@ -16,6 +16,9 @@
*/
package org.apache.commons.collections4.bidimap;
+import static org.apache.commons.collections4.bidimap.TreeBidiMap.DataElement.KEY;
+import static org.apache.commons.collections4.bidimap.TreeBidiMap.DataElement.VALUE;
+
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -35,9 +38,6 @@ import org.apache.commons.collections4.O
import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator;
import org.apache.commons.collections4.keyvalue.UnmodifiableMapEntry;
-import static org.apache.commons.collections4.bidimap.TreeBidiMap.DataElement.KEY;
-import static org.apache.commons.collections4.bidimap.TreeBidiMap.DataElement.VALUE;
-
/**
* Red-Black tree-based implementation of BidiMap where all objects added
* implement the <code>Comparable</code> interface.
@@ -137,6 +137,7 @@ public class TreeBidiMap<K extends Compa
*
* @return the number of key-value mappings in this map
*/
+ @Override
public int size() {
return nodeCount;
}
@@ -146,6 +147,7 @@ public class TreeBidiMap<K extends Compa
*
* @return true if the map is empty
*/
+ @Override
public boolean isEmpty() {
return nodeCount == 0;
}
@@ -160,6 +162,7 @@ public class TreeBidiMap<K extends Compa
* @throws ClassCastException if the key is of an inappropriate type
* @throws NullPointerException if the key is null
*/
+ @Override
public boolean containsKey(final Object key) {
checkKey(key);
return lookupKey(key) != null;
@@ -175,6 +178,7 @@ public class TreeBidiMap<K extends Compa
* @throws ClassCastException if the value is of an inappropriate type
* @throws NullPointerException if the value is null
*/
+ @Override
public boolean containsValue(final Object value) {
checkValue(value);
return lookupValue(value) != null;
@@ -192,6 +196,7 @@ public class TreeBidiMap<K extends Compa
* @throws ClassCastException if the key is of an inappropriate type
* @throws NullPointerException if the key is null
*/
+ @Override
public V get(final Object key) {
checkKey(key);
final Node<K, V> node = lookupKey(key);
@@ -222,6 +227,7 @@ public class TreeBidiMap<K extends Compa
* @throws ClassCastException if the key is of an inappropriate type
* @throws NullPointerException if the key is null
*/
+ @Override
public V put(final K key, final V value) {
final V result = get(key);
doPut(key, value);
@@ -235,6 +241,7 @@ public class TreeBidiMap<K extends Compa
*
* @param map the map to copy from
*/
+ @Override
public void putAll(final Map<? extends K, ? extends V> map) {
for (final Map.Entry<? extends K, ? extends V> e : map.entrySet()) {
put(e.getKey(), e.getValue());
@@ -252,6 +259,7 @@ public class TreeBidiMap<K extends Compa
* @throws ClassCastException if the key is of an inappropriate type
* @throws NullPointerException if the key is null
*/
+ @Override
public V remove(final Object key) {
return doRemoveKey(key);
}
@@ -259,6 +267,7 @@ public class TreeBidiMap<K extends Compa
/**
* Removes all mappings from this map.
*/
+ @Override
public void clear() {
modify();
@@ -280,6 +289,7 @@ public class TreeBidiMap<K extends Compa
* @throws ClassCastException if the value is of an inappropriate type
* @throws NullPointerException if the value is null
*/
+ @Override
public K getKey(final Object value) {
checkValue(value);
final Node<K, V> node = lookupValue(value);
@@ -297,6 +307,7 @@ public class TreeBidiMap<K extends Compa
* @throws ClassCastException if the value is of an inappropriate type
* @throws NullPointerException if the value is null
*/
+ @Override
public K removeValue(final Object value) {
return doRemoveValue(value);
}
@@ -308,6 +319,7 @@ public class TreeBidiMap<K extends Compa
* @return the first (lowest) key currently in this sorted map
* @throws NoSuchElementException if this map is empty
*/
+ @Override
public K firstKey() {
if (nodeCount == 0) {
throw new NoSuchElementException("Map is empty");
@@ -321,6 +333,7 @@ public class TreeBidiMap<K extends Compa
* @return the last (highest) key currently in this sorted map
* @throws NoSuchElementException if this map is empty
*/
+ @Override
public K lastKey() {
if (nodeCount == 0) {
throw new NoSuchElementException("Map is empty");
@@ -336,6 +349,7 @@ public class TreeBidiMap<K extends Compa
* @param key the key to search for next from
* @return the next key, null if no match or at end
*/
+ @Override
public K nextKey(final K key) {
checkKey(key);
final Node<K, V> node = nextGreater(lookupKey(key), KEY);
@@ -350,6 +364,7 @@ public class TreeBidiMap<K extends Compa
* @param key the key to search for previous from
* @return the previous key, null if no match or at start
*/
+ @Override
public K previousKey(final K key) {
checkKey(key);
final Node<K, V> node = nextSmaller(lookupKey(key), KEY);
@@ -369,6 +384,7 @@ public class TreeBidiMap<K extends Compa
*
* @return a set view of the keys contained in this map.
*/
+ @Override
public Set<K> keySet() {
if (keySet == null) {
keySet = new KeyView(KEY);
@@ -390,6 +406,7 @@ public class TreeBidiMap<K extends Compa
*
* @return a set view of the values contained in this map.
*/
+ @Override
public Set<V> values() {
if (valuesSet == null) {
valuesSet = new ValueView(KEY);
@@ -412,6 +429,7 @@ public class TreeBidiMap<K extends Compa
*
* @return a set view of the values contained in this map.
*/
+ @Override
public Set<Map.Entry<K, V>> entrySet() {
if (entrySet == null) {
entrySet = new EntryView();
@@ -420,6 +438,7 @@ public class TreeBidiMap<K extends Compa
}
//-----------------------------------------------------------------------
+ @Override
public OrderedMapIterator<K, V> mapIterator() {
if (isEmpty()) {
return EmptyOrderedMapIterator.<K, V>emptyOrderedMapIterator();
@@ -433,6 +452,7 @@ public class TreeBidiMap<K extends Compa
*
* @return the inverse map
*/
+ @Override
public OrderedBidiMap<V, K> inverseBidiMap() {
if (inverse == null) {
inverse = new Inverse();
@@ -1701,6 +1721,7 @@ public class TreeBidiMap<K extends Compa
super(orderType);
}
+ @Override
public K getKey() {
if (lastReturnedNode == null) {
throw new IllegalStateException(
@@ -1709,6 +1730,7 @@ public class TreeBidiMap<K extends Compa
return lastReturnedNode.getKey();
}
+ @Override
public V getValue() {
if (lastReturnedNode == null) {
throw new IllegalStateException(
@@ -1717,14 +1739,17 @@ public class TreeBidiMap<K extends Compa
return lastReturnedNode.getValue();
}
+ @Override
public V setValue(final V obj) {
throw new UnsupportedOperationException();
}
+ @Override
public K next() {
return navigateNext().getKey();
}
+ @Override
public K previous() {
return navigatePrevious().getKey();
}
@@ -1742,6 +1767,7 @@ public class TreeBidiMap<K extends Compa
super(orderType);
}
+ @Override
public V getKey() {
if (lastReturnedNode == null) {
throw new IllegalStateException(
@@ -1750,6 +1776,7 @@ public class TreeBidiMap<K extends Compa
return lastReturnedNode.getValue();
}
+ @Override
public K getValue() {
if (lastReturnedNode == null) {
throw new IllegalStateException(
@@ -1758,14 +1785,17 @@ public class TreeBidiMap<K extends Compa
return lastReturnedNode.getKey();
}
+ @Override
public K setValue(final K obj) {
throw new UnsupportedOperationException();
}
+ @Override
public V next() {
return navigateNext().getValue();
}
+ @Override
public V previous() {
return navigatePrevious().getValue();
}
@@ -1783,10 +1813,12 @@ public class TreeBidiMap<K extends Compa
super(KEY);
}
+ @Override
public Map.Entry<K, V> next() {
return navigateNext();
}
+ @Override
public Map.Entry<K, V> previous() {
return navigatePrevious();
}
@@ -1804,10 +1836,12 @@ public class TreeBidiMap<K extends Compa
super(VALUE);
}
+ @Override
public Map.Entry<V, K> next() {
return createEntry(navigateNext());
}
+ @Override
public Map.Entry<V, K> previous() {
return createEntry(navigatePrevious());
}
@@ -1976,6 +2010,7 @@ public class TreeBidiMap<K extends Compa
*
* @return the key corresponding to this entry.
*/
+ @Override
public K getKey() {
return key;
}
@@ -1985,6 +2020,7 @@ public class TreeBidiMap<K extends Compa
*
* @return the value corresponding to this entry.
*/
+ @Override
public V getValue() {
return value;
}
@@ -1996,6 +2032,7 @@ public class TreeBidiMap<K extends Compa
* @return does not return
* @throws UnsupportedOperationException always
*/
+ @Override
public V setValue(final V ignored) throws UnsupportedOperationException {
throw new UnsupportedOperationException("Map.Entry.setValue is not supported");
}
@@ -2046,30 +2083,37 @@ public class TreeBidiMap<K extends Compa
/** Store the entrySet once created. */
private Set<Map.Entry<V, K>> inverseEntrySet;
+ @Override
public int size() {
return TreeBidiMap.this.size();
}
+ @Override
public boolean isEmpty() {
return TreeBidiMap.this.isEmpty();
}
+ @Override
public K get(final Object key) {
return TreeBidiMap.this.getKey(key);
}
+ @Override
public V getKey(final Object value) {
return TreeBidiMap.this.get(value);
}
+ @Override
public boolean containsKey(final Object key) {
return TreeBidiMap.this.containsValue(key);
}
+ @Override
public boolean containsValue(final Object value) {
return TreeBidiMap.this.containsKey(value);
}
+ @Override
public V firstKey() {
if (TreeBidiMap.this.nodeCount == 0) {
throw new NoSuchElementException("Map is empty");
@@ -2077,6 +2121,7 @@ public class TreeBidiMap<K extends Compa
return leastNode(TreeBidiMap.this.rootNode[VALUE.ordinal()], VALUE).getValue();
}
+ @Override
public V lastKey() {
if (TreeBidiMap.this.nodeCount == 0) {
throw new NoSuchElementException("Map is empty");
@@ -2084,42 +2129,50 @@ public class TreeBidiMap<K extends Compa
return greatestNode(TreeBidiMap.this.rootNode[VALUE.ordinal()], VALUE).getValue();
}
+ @Override
public V nextKey(final V key) {
checkKey(key);
final Node<K, V> node = nextGreater(TreeBidiMap.this.<V>lookup(key, VALUE), VALUE);
return node == null ? null : node.getValue();
}
+ @Override
public V previousKey(final V key) {
checkKey(key);
final Node<K, V> node = TreeBidiMap.this.nextSmaller(TreeBidiMap.this.<V>lookup(key, VALUE), VALUE);
return node == null ? null : node.getValue();
}
+ @Override
public K put(final V key, final K value) {
final K result = get(key);
TreeBidiMap.this.doPut(value, key);
return result;
}
+ @Override
public void putAll(final Map<? extends V, ? extends K> map) {
for (final Map.Entry<? extends V, ? extends K> e : map.entrySet()) {
put(e.getKey(), e.getValue());
}
}
+ @Override
public K remove(final Object key) {
return TreeBidiMap.this.removeValue(key);
}
+ @Override
public V removeValue(final Object value) {
return TreeBidiMap.this.remove(value);
}
+ @Override
public void clear() {
TreeBidiMap.this.clear();
}
+ @Override
public Set<V> keySet() {
if (inverseKeySet == null) {
inverseKeySet = new ValueView(VALUE);
@@ -2127,6 +2180,7 @@ public class TreeBidiMap<K extends Compa
return inverseKeySet;
}
+ @Override
public Set<K> values() {
if (inverseValuesSet == null) {
inverseValuesSet = new KeyView(VALUE);
@@ -2134,6 +2188,7 @@ public class TreeBidiMap<K extends Compa
return inverseValuesSet;
}
+ @Override
public Set<Map.Entry<V, K>> entrySet() {
if (inverseEntrySet == null) {
inverseEntrySet = new InverseEntryView();
@@ -2141,6 +2196,7 @@ public class TreeBidiMap<K extends Compa
return inverseEntrySet;
}
+ @Override
public OrderedMapIterator<V, K> mapIterator() {
if (isEmpty()) {
return EmptyOrderedMapIterator.<V, K>emptyOrderedMapIterator();
@@ -2148,6 +2204,7 @@ public class TreeBidiMap<K extends Compa
return new InverseViewMapIterator(VALUE);
}
+ @Override
public OrderedBidiMap<K, V> inverseBidiMap() {
return TreeBidiMap.this;
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java Sat Jun 6 20:19:03 2015
@@ -19,12 +19,12 @@ package org.apache.commons.collections4.
import java.util.Map;
import java.util.Set;
-import org.apache.commons.collections4.set.UnmodifiableSet;
import org.apache.commons.collections4.BidiMap;
import org.apache.commons.collections4.MapIterator;
import org.apache.commons.collections4.Unmodifiable;
import org.apache.commons.collections4.iterators.UnmodifiableMapIterator;
import org.apache.commons.collections4.map.UnmodifiableEntrySet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
/**
* Decorates another {@link BidiMap} to ensure it can't be altered.
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java Sat Jun 6 20:19:03 2015
@@ -19,12 +19,12 @@ package org.apache.commons.collections4.
import java.util.Map;
import java.util.Set;
-import org.apache.commons.collections4.set.UnmodifiableSet;
import org.apache.commons.collections4.OrderedBidiMap;
import org.apache.commons.collections4.OrderedMapIterator;
import org.apache.commons.collections4.Unmodifiable;
import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator;
import org.apache.commons.collections4.map.UnmodifiableEntrySet;
+import org.apache.commons.collections4.set.UnmodifiableSet;
/**
* Decorates another {@link OrderedBidiMap} to ensure it can't be altered.
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java Sat Jun 6 20:19:03 2015
@@ -20,13 +20,13 @@ import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
-import org.apache.commons.collections4.set.UnmodifiableSet;
import org.apache.commons.collections4.OrderedMapIterator;
import org.apache.commons.collections4.SortedBidiMap;
import org.apache.commons.collections4.Unmodifiable;
import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator;
import org.apache.commons.collections4.map.UnmodifiableEntrySet;
import org.apache.commons.collections4.map.UnmodifiableSortedMap;
+import org.apache.commons.collections4.set.UnmodifiableSet;
/**
* Decorates another {@link SortedBidiMap} to ensure it can't be altered.
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java Sat Jun 6 20:19:03 2015
@@ -105,54 +105,67 @@ public abstract class AbstractCollection
//-----------------------------------------------------------------------
+ @Override
public boolean add(final E object) {
return decorated().add(object);
}
+ @Override
public boolean addAll(final Collection<? extends E> coll) {
return decorated().addAll(coll);
}
+ @Override
public void clear() {
decorated().clear();
}
+ @Override
public boolean contains(final Object object) {
return decorated().contains(object);
}
+ @Override
public boolean isEmpty() {
return decorated().isEmpty();
}
+ @Override
public Iterator<E> iterator() {
return decorated().iterator();
}
+ @Override
public boolean remove(final Object object) {
return decorated().remove(object);
}
+ @Override
public int size() {
return decorated().size();
}
+ @Override
public Object[] toArray() {
return decorated().toArray();
}
+ @Override
public <T> T[] toArray(final T[] object) {
return decorated().toArray(object);
}
+ @Override
public boolean containsAll(final Collection<?> coll) {
return decorated().containsAll(coll);
}
+ @Override
public boolean removeAll(final Collection<?> coll) {
return decorated().removeAll(coll);
}
+ @Override
public boolean retainAll(final Collection<?> coll) {
return decorated().retainAll(coll);
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java Sat Jun 6 20:19:03 2015
@@ -97,6 +97,7 @@ public class CompositeCollection<E> impl
*
* @return total number of elements in all contained containers
*/
+ @Override
public int size() {
int size = 0;
for (final Collection<E> item : all) {
@@ -112,6 +113,7 @@ public class CompositeCollection<E> impl
*
* @return true if all of the contained collections are empty
*/
+ @Override
public boolean isEmpty() {
for (final Collection<E> item : all) {
if (item.isEmpty() == false) {
@@ -129,6 +131,7 @@ public class CompositeCollection<E> impl
* @param obj the object to search for
* @return true if obj is contained in any of the contained collections
*/
+ @Override
public boolean contains(final Object obj) {
for (final Collection<E> item : all) {
if (item.contains(obj)) {
@@ -148,6 +151,7 @@ public class CompositeCollection<E> impl
* the order they were added, but this behavior should not be relied upon.
* @see IteratorChain
*/
+ @Override
public Iterator<E> iterator() {
if (all.isEmpty()) {
return EmptyIterator.<E>emptyIterator();
@@ -164,6 +168,7 @@ public class CompositeCollection<E> impl
*
* @return an object array of all the elements in the collection
*/
+ @Override
public Object[] toArray() {
final Object[] result = new Object[size()];
int i = 0;
@@ -181,6 +186,7 @@ public class CompositeCollection<E> impl
* @param array the array to use, populating if possible
* @return an array of all the elements in the collection
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> T[] toArray(final T[] array) {
final int size = size();
@@ -215,6 +221,7 @@ public class CompositeCollection<E> impl
* @throws NullPointerException if the object cannot be added because its null
* @throws IllegalArgumentException if the object cannot be added
*/
+ @Override
public boolean add(final E obj) {
if (mutator == null) {
throw new UnsupportedOperationException(
@@ -234,6 +241,7 @@ public class CompositeCollection<E> impl
* @throws NullPointerException if the object cannot be removed because its null
* @throws IllegalArgumentException if the object cannot be removed
*/
+ @Override
public boolean remove(final Object obj) {
if (mutator == null) {
throw new UnsupportedOperationException(
@@ -251,6 +259,7 @@ public class CompositeCollection<E> impl
* @param coll the collection to check for
* @return true if all elements contained
*/
+ @Override
public boolean containsAll(final Collection<?> coll) {
for (final Object item : coll) {
if (contains(item) == false) {
@@ -272,6 +281,7 @@ public class CompositeCollection<E> impl
* @throws NullPointerException if the object cannot be added because its null
* @throws IllegalArgumentException if the object cannot be added
*/
+ @Override
public boolean addAll(final Collection<? extends E> coll) {
if (mutator == null) {
throw new UnsupportedOperationException(
@@ -289,6 +299,7 @@ public class CompositeCollection<E> impl
* @return true if the collection was modified
* @throws UnsupportedOperationException if removeAll is unsupported
*/
+ @Override
public boolean removeAll(final Collection<?> coll) {
if (coll.size() == 0) {
return false;
@@ -310,6 +321,7 @@ public class CompositeCollection<E> impl
* @return true if the collection was modified
* @throws UnsupportedOperationException if retainAll is unsupported
*/
+ @Override
public boolean retainAll(final Collection<?> coll) {
boolean changed = false;
for (final Collection<E> item : all) {
@@ -325,6 +337,7 @@ public class CompositeCollection<E> impl
*
* @throws UnsupportedOperationException if clear is unsupported
*/
+ @Override
public void clear() {
for (final Collection<E> coll : all) {
coll.clear();
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java Sat Jun 6 20:19:03 2015
@@ -102,36 +102,42 @@ public class SynchronizedCollection<E> i
//-----------------------------------------------------------------------
+ @Override
public boolean add(final E object) {
synchronized (lock) {
return decorated().add(object);
}
}
+ @Override
public boolean addAll(final Collection<? extends E> coll) {
synchronized (lock) {
return decorated().addAll(coll);
}
}
+ @Override
public void clear() {
synchronized (lock) {
decorated().clear();
}
}
+ @Override
public boolean contains(final Object object) {
synchronized (lock) {
return decorated().contains(object);
}
}
+ @Override
public boolean containsAll(final Collection<?> coll) {
synchronized (lock) {
return decorated().containsAll(coll);
}
}
+ @Override
public boolean isEmpty() {
synchronized (lock) {
return decorated().isEmpty();
@@ -149,40 +155,47 @@ public class SynchronizedCollection<E> i
*
* @return an iterator that must be manually synchronized on the collection
*/
+ @Override
public Iterator<E> iterator() {
return decorated().iterator();
}
+ @Override
public Object[] toArray() {
synchronized (lock) {
return decorated().toArray();
}
}
+ @Override
public <T> T[] toArray(final T[] object) {
synchronized (lock) {
return decorated().toArray(object);
}
}
+ @Override
public boolean remove(final Object object) {
synchronized (lock) {
return decorated().remove(object);
}
}
+ @Override
public boolean removeAll(final Collection<?> coll) {
synchronized (lock) {
return decorated().removeAll(coll);
}
}
+ @Override
public boolean retainAll(final Collection<?> coll) {
synchronized (lock) {
return decorated().retainAll(coll);
}
}
+ @Override
public int size() {
synchronized (lock) {
return decorated().size();
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java Sat Jun 6 20:19:03 2015
@@ -148,10 +148,12 @@ public final class UnmodifiableBoundedCo
}
//-----------------------------------------------------------------------
+ @Override
public boolean isFull() {
return decorated().isFull();
}
+ @Override
public int maxSize() {
return decorated().maxSize();
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java Sat Jun 6 20:19:03 2015
@@ -134,6 +134,7 @@ public final class BooleanComparator imp
* @return negative if obj1 is less, positive if greater, zero if equal
* @throws NullPointerException when either argument <code>null</code>
*/
+ @Override
public int compare(final Boolean b1, final Boolean b2) {
final boolean v1 = b1.booleanValue();
final boolean v2 = b2.booleanValue();
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java Sat Jun 6 20:19:03 2015
@@ -24,7 +24,8 @@ import java.util.Comparator;
* objects.
* <p>
* This Comparator is useful, for example, for enforcing the natural order in
- * custom implementations of {@link java.util.SortedSet SortedSet} and {@link java.util.SortedMap SortedMap}.
+ * custom implementations of {@link java.util.SortedSet SortedSet} and
+ * {@link java.util.SortedMap SortedMap}.
* <p>
* Note: In the 2.0 and 2.1 releases of Commons Collections, this class would
* throw a {@link ClassCastException} if either of the arguments to
@@ -62,7 +63,7 @@ public class ComparableComparator<E exte
*/
@SuppressWarnings("unchecked")
public static <E extends Comparable<? super E>> ComparableComparator<E> comparableComparator() {
- return (ComparableComparator<E>) INSTANCE;
+ return INSTANCE;
}
//-----------------------------------------------------------------------
@@ -89,6 +90,7 @@ public class ComparableComparator<E exte
* @throws ClassCastException if <i>obj1</i> is not a <code>Comparable</code>,
* or when <code>((Comparable)obj1).compareTo(obj2)</code> does
*/
+ @Override
public int compare(final E obj1, final E obj2) {
return obj1.compareTo(obj2);
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java Sat Jun 6 20:19:03 2015
@@ -263,6 +263,7 @@ public class ComparatorChain<E> implemen
* @return -1, 0, or 1
* @throws UnsupportedOperationException if the ComparatorChain does not contain at least one Comparator
*/
+ @Override
public int compare(final E o1, final E o2) throws UnsupportedOperationException {
if (isLocked == false) {
checkChainIntegrity();
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java Sat Jun 6 20:19:03 2015
@@ -224,6 +224,7 @@ public class FixedOrderComparator<T> imp
* to this Comparator and an alternative behavior has not been set
* via {@link #setUnknownObjectBehavior(UnknownObjectBehavior)}.
*/
+ @Override
public int compare(final T obj1, final T obj2) {
isLocked = true;
final Integer position1 = map.get(obj1);
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java Sat Jun 6 20:19:03 2015
@@ -135,6 +135,7 @@ public class NullComparator<E> implement
* "higher" than (greater than, after, etc.) <code>o2</code>; or
* <code>0</code> if <code>o1</code> and <code>o2</code> are equal.
**/
+ @Override
public int compare(final E o1, final E o2) {
if(o1 == o2) { return 0; }
if(o1 == null) { return this.nullsAreHigh ? 1 : -1; }
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java Sat Jun 6 20:19:03 2015
@@ -72,6 +72,7 @@ public class ReverseComparator<E> implem
* @param obj2 the second object to compare
* @return negative if obj1 is less, positive if greater, zero if equal
*/
+ @Override
public int compare(final E obj1, final E obj2) {
return comparator.compare(obj2, obj1);
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java?rev=1683951&r1=1683950&r2=1683951&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java Sat Jun 6 20:19:03 2015
@@ -77,6 +77,7 @@ public class TransformingComparator<I, O
* @param obj2 the second object to transform then compare
* @return negative if obj1 is less, positive if greater, zero if equal
*/
+ @Override
public int compare(final I obj1, final I obj2) {
final O value1 = this.transformer.transform(obj1);
final O value2 = this.transformer.transform(obj2);