commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r966327 [3/5] - in /commons/proper/collections/trunk/src: java/org/apache/commons/collections/ java/org/apache/commons/collections/bag/ java/org/apache/commons/collections/bidimap/ java/org/apache/commons/collections/buffer/ java/org/apache...
Date Wed, 21 Jul 2010 17:39:55 GMT
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/SingletonMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/SingletonMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/SingletonMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/SingletonMap.java Wed Jul 21 17:39:49 2010
@@ -466,6 +466,7 @@ public class SingletonMap<K, V>
             hasNext = true;
         }
         
+        @Override
         public String toString() {
             if (hasNext) {
                 return "Iterator[]";
@@ -487,18 +488,23 @@ public class SingletonMap<K, V>
             this.parent = parent;
         }
 
+        @Override
         public int size() {
             return 1;
         }
+        @Override
         public boolean isEmpty() {
             return false;
         }
+        @Override
         public boolean contains(Object object) {
             return parent.containsValue(object);
         }
+        @Override
         public void clear() {
             throw new UnsupportedOperationException();
         }
+        @Override
         public Iterator<V> iterator() {
             return new SingletonIterator<V>(parent.getValue(), false);
         }
@@ -510,6 +516,7 @@ public class SingletonMap<K, V>
      *
      * @return a shallow clone
      */
+    @Override
     @SuppressWarnings("unchecked")
     public SingletonMap<K, V> clone() {
         try {
@@ -525,6 +532,7 @@ public class SingletonMap<K, V>
      * @param obj  the object to compare to
      * @return true if equal
      */
+    @Override
     @SuppressWarnings("unchecked")
     public boolean equals(Object obj) {
         if (obj == this) {
@@ -546,6 +554,7 @@ public class SingletonMap<K, V>
      * 
      * @return the hash code defined in the Map interface
      */
+    @Override
     public int hashCode() {
         return (getKey() == null ? 0 : getKey().hashCode()) ^
                (getValue() == null ? 0 : getValue().hashCode()); 
@@ -556,6 +565,7 @@ public class SingletonMap<K, V>
      * 
      * @return a string version of the map
      */
+    @Override
     public String toString() {
         return new StringBuilder(128)
             .append('{')

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/TransformedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/TransformedMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/TransformedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/TransformedMap.java Wed Jul 21 17:39:49 2010
@@ -209,6 +209,7 @@ public class TransformedMap<K, V>
      * @return the transformed value
      * @since Commons Collections 3.1
      */
+    @Override
     protected V checkSetValue(V value) {
         return valueTransformer.transform(value);
     }
@@ -219,17 +220,20 @@ public class TransformedMap<K, V>
      * @return true if a value transformer is in use
      * @since Commons Collections 3.1
      */
+    @Override
     protected boolean isSetValueChecking() {
         return (valueTransformer != null);
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public V put(K key, V value) {
         key = transformKey(key);
         value = transformValue(value);
         return decorated().put(key, value);
     }
 
+    @Override
     public void putAll(Map<? extends K, ? extends V> mapToCopy) {
         mapToCopy = transformMap(mapToCopy);
         decorated().putAll(mapToCopy);

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java Wed Jul 21 17:39:49 2010
@@ -68,35 +68,43 @@ public final class UnmodifiableEntrySet<
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public boolean add(Map.Entry<K, V> object) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean addAll(Collection<? extends Map.Entry<K, V>> coll) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void clear() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean remove(Object object) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean removeAll(Collection<?> coll) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean retainAll(Collection<?> coll) {
         throw new UnsupportedOperationException();
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public Iterator<Map.Entry<K, V>> iterator() {
         return new UnmodifiableEntrySetIterator(collection.iterator());
     }
     
+    @Override
     @SuppressWarnings("unchecked")
     public Object[] toArray() {
         Object[] array = collection.toArray();
@@ -106,6 +114,7 @@ public final class UnmodifiableEntrySet<
         return array;
     }
     
+    @Override
     @SuppressWarnings("unchecked")
     public <T> T[] toArray(T[] array) {
         Object[] result = array;
@@ -142,10 +151,12 @@ public final class UnmodifiableEntrySet<
             super(iterator);
         }
 
+        @Override
         public Map.Entry<K, V> next() {
             return new UnmodifiableEntry(iterator.next());
         }
 
+        @Override
         public void remove() {
             throw new UnsupportedOperationException();
         }
@@ -161,6 +172,7 @@ public final class UnmodifiableEntrySet<
             super(entry);
         }
 
+        @Override
         public V setValue(V obj) {
             throw new UnsupportedOperationException();
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableMap.java Wed Jul 21 17:39:49 2010
@@ -103,22 +103,27 @@ public final class UnmodifiableMap<K, V>
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public void clear() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public V put(K key, V value) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void putAll(Map<? extends K, ? extends V> mapToCopy) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public V remove(Object key) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public MapIterator<K, V> mapIterator() {
         if (map instanceof IterableMap) {
             MapIterator<K, V> it = ((IterableMap<K, V>) map).mapIterator();
@@ -128,16 +133,19 @@ public final class UnmodifiableMap<K, V>
         return UnmodifiableMapIterator.decorate(it);
     }
 
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
         Set<Map.Entry<K, V>> set = super.entrySet();
         return UnmodifiableEntrySet.decorate(set);
     }
 
+    @Override
     public Set<K> keySet() {
         Set<K> set = super.keySet();
         return UnmodifiableSet.decorate(set);
     }
 
+    @Override
     public Collection<V> values() {
         Collection<V> coll = super.values();
         return UnmodifiableCollection.decorate(coll);

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java Wed Jul 21 17:39:49 2010
@@ -101,37 +101,45 @@ public final class UnmodifiableOrderedMa
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public OrderedMapIterator<K, V> mapIterator() {
         OrderedMapIterator<K, V> it = decorated().mapIterator();
         return UnmodifiableOrderedMapIterator.decorate(it);
     }
 
+    @Override
     public void clear() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public V put(K key, V value) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void putAll(Map<? extends K, ? extends V> mapToCopy) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public V remove(Object key) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
         Set<Map.Entry<K, V>> set = super.entrySet();
         return UnmodifiableEntrySet.decorate(set);
     }
 
+    @Override
     public Set<K> keySet() {
         Set<K> set = super.keySet();
         return UnmodifiableSet.decorate(set);
     }
 
+    @Override
     public Collection<V> values() {
         Collection<V> coll = super.values();
         return UnmodifiableCollection.decorate(coll);

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java Wed Jul 21 17:39:49 2010
@@ -101,55 +101,68 @@ public final class UnmodifiableSortedMap
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public void clear() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public V put(K key, V value) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void putAll(Map<? extends K, ? extends V> mapToCopy) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public V remove(Object key) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
         return UnmodifiableEntrySet.decorate(super.entrySet());
     }
 
+    @Override
     public Set<K> keySet() {
         return UnmodifiableSet.decorate(super.keySet());
     }
 
+    @Override
     public Collection<V> values() {
         return UnmodifiableCollection.decorate(super.values());
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public K firstKey() {
         return decorated().firstKey();
     }
 
+    @Override
     public K lastKey() {
         return decorated().lastKey();
     }
 
+    @Override
     public Comparator<? super K> comparator() {
         return decorated().comparator();
     }
 
+    @Override
     public SortedMap<K, V> subMap(K fromKey, K toKey) {
         return new UnmodifiableSortedMap<K, V>(decorated().subMap(fromKey, toKey));
     }
 
+    @Override
     public SortedMap<K, V> headMap(K toKey) {
         return new UnmodifiableSortedMap<K, V>(decorated().headMap(toKey));
     }
 
+    @Override
     public SortedMap<K, V> tailMap(K fromKey) {
         return new UnmodifiableSortedMap<K, V>(decorated().tailMap(fromKey));
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java Wed Jul 21 17:39:49 2010
@@ -60,6 +60,7 @@ public abstract class AbstractSetDecorat
      * 
      * @return the decorated set
      */
+    @Override
     protected Set<E> decorated() {
         return (Set<E>) super.decorated();
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java Wed Jul 21 17:39:49 2010
@@ -61,6 +61,7 @@ public abstract class AbstractSortedSetD
      * 
      * @return the decorated set
      */
+    @Override
     protected SortedSet<E> decorated() {
         return (SortedSet<E>) super.decorated();
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/CompositeSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/CompositeSet.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/CompositeSet.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/CompositeSet.java Wed Jul 21 17:39:49 2010
@@ -70,6 +70,7 @@ public class CompositeSet<E> extends Com
      * @see org.apache.commons.collections.collection.CompositeCollection.CollectionMutator
      * @see SetMutator
      */
+    @Override
     public synchronized void addComposited(Collection<E> c) {
         if (!(c instanceof Set)) {
             throw new IllegalArgumentException("Collections added must implement java.util.Set");
@@ -110,6 +111,7 @@ public class CompositeSet<E> extends Com
      *
      * @throws IllegalArgumentException if c or d does not implement java.util.Set
      */
+    @Override
     @SuppressWarnings("unchecked")
     public synchronized void addComposited(Collection<E> c, Collection<E> d) {
         if (!(c instanceof Set)) throw new IllegalArgumentException("Argument must implement java.util.Set");
@@ -122,6 +124,7 @@ public class CompositeSet<E> extends Com
      * @param comps
      * @throws IllegalArgumentException if any of the collections in comps do not implement Set
      */
+    @Override
     public synchronized void addComposited(Collection<E>[] comps) {
         for (int i = comps.length - 1; i >= 0; --i) {
             this.addComposited(comps[i]);
@@ -135,6 +138,7 @@ public class CompositeSet<E> extends Com
      * composited sets will throw IllegalArgumentException
      * <p>
      */
+    @Override
     public void setMutator(CollectionMutator<E> mutator) {
         super.setMutator(mutator);
     }
@@ -148,6 +152,7 @@ public class CompositeSet<E> extends Com
      * @param obj Object to be removed
      * @return true if the object is removed, false otherwise
      */
+    @Override
     public boolean remove(Object obj) {
         for (Set<? extends E> set : getCollections()) {
             if (set.contains(obj)) return set.remove(obj);
@@ -158,6 +163,7 @@ public class CompositeSet<E> extends Com
     /**
      * @see Set#equals
      */
+    @Override
     @SuppressWarnings("unchecked")
     public boolean equals(Object obj) {
         if (obj instanceof Set) {
@@ -170,6 +176,7 @@ public class CompositeSet<E> extends Com
     /**
      * @see Set#hashCode
      */
+    @Override
     public int hashCode() {
         int code = 0;
         for (E e : this) {

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/ListOrderedSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/ListOrderedSet.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/ListOrderedSet.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/ListOrderedSet.java Wed Jul 21 17:39:49 2010
@@ -168,15 +168,18 @@ public class ListOrderedSet<E> extends A
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public void clear() {
         collection.clear();
         setOrder.clear();
     }
 
+    @Override
     public OrderedIterator<E> iterator() {
         return new OrderedSetIterator<E>(setOrder.listIterator(), collection);
     }
 
+    @Override
     public boolean add(E object) {
         if (collection.add(object)) {
             setOrder.add(object);
@@ -185,6 +188,7 @@ public class ListOrderedSet<E> extends A
         return false;
     }
 
+    @Override
     public boolean addAll(Collection<? extends E> coll) {
         boolean result = false;
         for (E e : coll) {
@@ -193,12 +197,14 @@ public class ListOrderedSet<E> extends A
         return result;
     }
 
+    @Override
     public boolean remove(Object object) {
         boolean result = collection.remove(object);
         setOrder.remove(object);
         return result;
     }
 
+    @Override
     public boolean removeAll(Collection<?> coll) {
         boolean result = false;
         for (Iterator<?> it = coll.iterator(); it.hasNext();) {
@@ -207,6 +213,7 @@ public class ListOrderedSet<E> extends A
         return result;
     }
 
+    @Override
     public boolean retainAll(Collection<?> coll) {
         boolean result = collection.retainAll(coll);
         if (result == false) {
@@ -224,10 +231,12 @@ public class ListOrderedSet<E> extends A
         return result;
     }
 
+    @Override
     public Object[] toArray() {
         return setOrder.toArray();
     }
 
+    @Override
     public <T> T[] toArray(T a[]) {
         return setOrder.toArray(a);
     }
@@ -273,6 +282,7 @@ public class ListOrderedSet<E> extends A
      * any custom toStrings will be ignored.
      */
     // Fortunately List.toString and Set.toString look the same
+    @Override
     public String toString() {
         return setOrder.toString();
     }
@@ -294,11 +304,13 @@ public class ListOrderedSet<E> extends A
             this.set = set;
         }
 
+        @Override
         public E next() {
             last = iterator.next();
             return last;
         }
 
+        @Override
         public void remove() {
             set.remove(last);
             iterator.remove();

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/MapBackedSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/MapBackedSet.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/MapBackedSet.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/MapBackedSet.java Wed Jul 21 17:39:49 2010
@@ -147,10 +147,12 @@ public final class MapBackedSet<E, V> im
         return map.keySet().toArray(array);
     }
 
+    @Override
     public boolean equals(Object obj) {
         return map.keySet().equals(obj);
     }
 
+    @Override
     public int hashCode() {
         return map.keySet().hashCode();
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/PredicatedSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/PredicatedSet.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/PredicatedSet.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/PredicatedSet.java Wed Jul 21 17:39:49 2010
@@ -82,6 +82,7 @@ public class PredicatedSet<E> extends Pr
      * 
      * @return the decorated set
      */
+    @Override
     protected Set<E> decorated() {
         return (Set<E>) super.decorated();
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java Wed Jul 21 17:39:49 2010
@@ -82,6 +82,7 @@ public class PredicatedSortedSet<E> exte
      * 
      * @return the decorated sorted set
      */
+    @Override
     protected SortedSet<E> decorated() {
         return (SortedSet<E>) super.decorated();
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSet.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSet.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSet.java Wed Jul 21 17:39:49 2010
@@ -67,30 +67,37 @@ public final class UnmodifiableSet<E>
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public Iterator<E> iterator() {
         return UnmodifiableIterator.<E>decorate(decorated().iterator());
     }
 
+    @Override
     public boolean add(E object) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean addAll(Collection<? extends E> coll) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void clear() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean remove(Object object) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean removeAll(Collection<?> coll) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean retainAll(Collection<?> coll) {
         throw new UnsupportedOperationException();
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java Wed Jul 21 17:39:49 2010
@@ -96,45 +96,55 @@ public final class UnmodifiableSortedSet
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public Iterator<E> iterator() {
         return UnmodifiableIterator.decorate(decorated().iterator());
     }
 
+    @Override
     public boolean add(E object) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean addAll(Collection<? extends E> coll) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void clear() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean remove(Object object) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean removeAll(Collection<?> coll) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean retainAll(Collection<?> coll) {
         throw new UnsupportedOperationException();
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public SortedSet<E> subSet(E fromElement, E toElement) {
         SortedSet<E> sub = decorated().subSet(fromElement, toElement);
         return new UnmodifiableSortedSet<E>(sub);
     }
 
+    @Override
     public SortedSet<E> headSet(E toElement) {
         SortedSet<E> sub = decorated().headSet(toElement);
         return new UnmodifiableSortedSet<E>(sub);
     }
 
+    @Override
     public SortedSet<E> tailSet(E fromElement) {
         SortedSet<E> sub = decorated().tailSet(fromElement);
         return new UnmodifiableSortedSet<E>(sub);

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java Wed Jul 21 17:39:49 2010
@@ -130,6 +130,7 @@ public class AbstractIterableGetMapDecor
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean equals(Object object) {
         if (object == this) {
             return true;
@@ -140,6 +141,7 @@ public class AbstractIterableGetMapDecor
     /**
      * {@inheritDoc}
      */
+    @Override
     public int hashCode() {
         return decorated().hashCode();
     }
@@ -147,6 +149,7 @@ public class AbstractIterableGetMapDecor
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString() {
         return decorated().toString();
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/BulkTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/BulkTest.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/BulkTest.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/BulkTest.java Wed Jul 21 17:39:49 2010
@@ -174,6 +174,7 @@ public class BulkTest extends TestCase i
      *
      *  @return  a clone of this <code>BulkTest</code>
      */
+    @Override
     public Object clone() {
         try {
             return super.clone();
@@ -226,6 +227,7 @@ public class BulkTest extends TestCase i
      *
      *  @return the display name of this <code>BulkTest</code>
      */
+    @Override
     public String toString() {
         return getName() + "(" + verboseName + ") ";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/LocalTestNode.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/LocalTestNode.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/LocalTestNode.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/LocalTestNode.java Wed Jul 21 17:39:49 2010
@@ -96,6 +96,7 @@ class LocalTestNode<K extends Comparable
      *
      * @return true if equal
      */
+    @Override
     @SuppressWarnings("unchecked")
     public boolean equals(Object o) {
 
@@ -116,6 +117,7 @@ class LocalTestNode<K extends Comparable
     /**
      * @return hash code
      */
+    @Override
     public int hashCode() {
         return getKey().hashCode() ^ getValue().hashCode();
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestArrayStack.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestArrayStack.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestArrayStack.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestArrayStack.java Wed Jul 21 17:39:49 2010
@@ -42,6 +42,7 @@ public class TestArrayStack<E> extends T
         junit.textui.TestRunner.main(testCaseName);
     }
 
+    @Override
     public ArrayStack<E> makeObject() {
         return new ArrayStack<E>();
     }
@@ -97,6 +98,7 @@ public class TestArrayStack<E> extends T
 
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public void testSearch() {
         ArrayStack<E> stack = makeObject();

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestClosureUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestClosureUtils.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestClosureUtils.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestClosureUtils.java Wed Jul 21 17:39:49 2010
@@ -69,12 +69,14 @@ public class TestClosureUtils extends ju
     /**
      * Set up instance variables required by this test case.
      */
+    @Override
     public void setUp() {
     }
 
     /**
      * Tear down instance variables required by this test case.
      */
+    @Override
     public void tearDown() {
     }
 

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestFactoryUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestFactoryUtils.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestFactoryUtils.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestFactoryUtils.java Wed Jul 21 17:39:49 2010
@@ -50,12 +50,14 @@ public class TestFactoryUtils extends ju
     /**
      * Set up instance variables required by this test case.
      */
+    @Override
     public void setUp() {
     }
 
     /**
      * Tear down instance variables required by this test case.
      */
+    @Override
     public void tearDown() {
     }
 
@@ -205,6 +207,7 @@ public class TestFactoryUtils extends ju
         public Mock1(Mock1 mock) {
             iVal = mock.iVal;
         }
+        @Override
         public boolean equals(Object obj) {
             if (obj instanceof Mock1) {
                 if (iVal == ((Mock1) obj).iVal) {
@@ -221,6 +224,7 @@ public class TestFactoryUtils extends ju
         public Mock2(Object val) {
             iVal = val;
         }
+        @Override
         public boolean equals(Object obj) {
             if (obj instanceof Mock2) {
                 if (iVal == ((Mock2) obj).iVal) {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestLinkedList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestLinkedList.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestLinkedList.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestLinkedList.java Wed Jul 21 17:39:49 2010
@@ -44,6 +44,7 @@ public abstract class TestLinkedList<T> 
         super(testName);
     }
 
+    @Override
     public abstract LinkedList<T> makeObject();
 
     /**
@@ -51,6 +52,7 @@ public abstract class TestLinkedList<T> 
      *
      *  @return the collection field as a List
      */
+    @Override
     public LinkedList<T> getCollection() {
         return (LinkedList<T>) super.getCollection();
     }
@@ -197,6 +199,7 @@ public abstract class TestLinkedList<T> 
     /**
      *  Returns an empty {@link LinkedList}.
      */
+    @Override
     public Collection<T> makeConfirmedCollection() {
         return new LinkedList<T>();
     }
@@ -204,6 +207,7 @@ public abstract class TestLinkedList<T> 
     /**
      *  Returns a full {@link LinkedList}.
      */
+    @Override
     public Collection<T> makeConfirmedFullCollection() {
         List<T> list = new LinkedList<T>();
         list.addAll(Arrays.asList(getFullElements()));

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestListUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestListUtils.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestListUtils.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestListUtils.java Wed Jul 21 17:39:49 2010
@@ -56,6 +56,7 @@ public class TestListUtils extends BulkT
         return BulkTest.makeSuite(TestListUtils.class);
     }
 
+    @Override
     public void setUp() {
         fullArray = new String[]{a, b, c, d, e};
         fullList = new ArrayList<String>(Arrays.asList(fullArray));

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestMapUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestMapUtils.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestMapUtils.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestMapUtils.java Wed Jul 21 17:39:49 2010
@@ -278,6 +278,7 @@ public class TestMapUtils extends BulkTe
         in.put("5", "E");
 
         ResourceBundle b = new ListResourceBundle() {
+            @Override
             public Object[][] getContents() {
                 final Object[][] contents = new Object[ in.size() ][2];
                 final Iterator<String> i = in.keySet().iterator();

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTransformerUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTransformerUtils.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTransformerUtils.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTransformerUtils.java Wed Jul 21 17:39:49 2010
@@ -77,12 +77,14 @@ public class TestTransformerUtils extend
     /**
      * Set up instance variables required by this test case.
      */
+    @Override
     public void setUp() {
     }
 
     /**
      * Tear down instance variables required by this test case.
      */
+    @Override
     public void tearDown() {
     }
 

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTreeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTreeMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTreeMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTreeMap.java Wed Jul 21 17:39:49 2010
@@ -38,6 +38,7 @@ public abstract class TestTreeMap<K, V> 
         junit.textui.TestRunner.main(testCaseName);
     }
 
+    @Override
     public boolean isAllowNullKey() {
         return false;
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/AbstractTestBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/AbstractTestBag.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/AbstractTestBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/AbstractTestBag.java Wed Jul 21 17:39:49 2010
@@ -63,6 +63,7 @@ public abstract class AbstractTestBag<T>
      * 
      * @return the bag to be tested
      */
+    @Override
     public abstract Bag<T> makeObject();
 
     //-----------------------------------------------------------------------
@@ -491,6 +492,7 @@ public abstract class AbstractTestBag<T>
      *
      * TODO: store a new serialized object on the disk.
      */
+    @Override
     protected boolean skipSerializedCanonicalTests() {
         return true;
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestHashBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestHashBag.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestHashBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestHashBag.java Wed Jul 21 17:39:49 2010
@@ -44,10 +44,12 @@ public class TestHashBag<T> extends Abst
         junit.textui.TestRunner.main(testCaseName);
     }
 
+    @Override
     public Bag<T> makeObject() {
         return new HashBag<T>();
     }
     
+    @Override
     public String getCompatibilityVersion() {
         return "3";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java Wed Jul 21 17:39:49 2010
@@ -65,6 +65,7 @@ public class TestPredicatedBag<T> extend
         return PredicatedBag.decorate(bag, predicate);
     }
 
+    @Override
     public Bag<T> makeObject() {
         return decorateBag(new HashBag<T>(), truePredicate);
     }
@@ -128,6 +129,7 @@ public class TestPredicatedBag<T> extend
         }
     }
 
+    @Override
     public String getCompatibilityVersion() {
         return "3.1";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java Wed Jul 21 17:39:49 2010
@@ -67,6 +67,7 @@ public class TestPredicatedSortedBag<T> 
         return PredicatedSortedBag.decorate(bag, predicate);
     }
 
+    @Override
     public SortedBag<T> makeObject() {
         return decorateBag(new TreeBag<T>(), truePredicate);
     }
@@ -105,6 +106,7 @@ public class TestPredicatedSortedBag<T> 
         assertTrue("natural order, so comparator should be null", c == null);
     }
 
+    @Override
     public String getCompatibilityVersion() {
         return "3.1";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java Wed Jul 21 17:39:49 2010
@@ -47,6 +47,7 @@ public class TestTransformedBag<T> exten
         junit.textui.TestRunner.main(testCaseName);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public Bag<T> makeObject() {
         return TransformedBag.decorate(new HashBag<T>(), (Transformer<T, T>) TestTransformedCollection.NOOP_TRANSFORMER);
@@ -87,6 +88,7 @@ public class TestTransformedBag<T> exten
         assertEquals(true, bag.remove(new Integer((String) els[0])));
     }
 
+    @Override
     public String getCompatibilityVersion() {
         return "3.1";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java Wed Jul 21 17:39:49 2010
@@ -48,6 +48,7 @@ public class TestTransformedSortedBag<T>
         junit.textui.TestRunner.main(testCaseName);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public SortedBag<T> makeObject() {
         return TransformedSortedBag.decorate(new TreeBag<T>(), (Transformer<T, T>) TestTransformedCollection.NOOP_TRANSFORMER);
@@ -83,6 +84,7 @@ public class TestTransformedSortedBag<T>
         assertEquals(true, bag.remove(new Integer((String) els[0])));
     }
 
+    @Override
     public String getCompatibilityVersion() {
         return "3.1";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTreeBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTreeBag.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTreeBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTreeBag.java Wed Jul 21 17:39:49 2010
@@ -45,6 +45,7 @@ public class TestTreeBag<T> extends Abst
         junit.textui.TestRunner.main(testCaseName);
     }
 
+    @Override
     public SortedBag<T> makeObject() {
         return new TreeBag<T>();
     }
@@ -79,6 +80,7 @@ public class TestTreeBag<T> extends Abst
         assertEquals("Should get last key", "D", ((SortedBag<T>) bag).last());
     }
 
+    @Override
     public String getCompatibilityVersion() {
         return "3";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java Wed Jul 21 17:39:49 2010
@@ -60,11 +60,13 @@ public abstract class AbstractTestBidiMa
     /**
      * Override to return the empty BidiMap.
      */
+    @Override
     public abstract BidiMap<K, V> makeObject();
 
     /**
      * Override to indicate to AbstractTestMap this is a BidiMap.
      */
+    @Override
     public boolean isAllowDuplicateValues() {
         return false;
     }
@@ -72,6 +74,7 @@ public abstract class AbstractTestBidiMa
     /**
      * Override as DualHashBidiMap didn't exist until version 3.
      */
+    @Override
     public String getCompatibilityVersion() {
         return "3";
     }
@@ -117,6 +120,7 @@ public abstract class AbstractTestBidiMa
      * <p>
      * This implementation checks the inverse map as well.
      */
+    @Override
     public void verify() {
         verifyInverse();
         super.verify();
@@ -334,6 +338,7 @@ public abstract class AbstractTestBidiMa
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public BulkTest bulkTestMapEntrySet() {
         return new TestBidiMapEntrySet();
     }
@@ -412,45 +417,56 @@ public abstract class AbstractTestBidiMa
             this.main = main;
         }
 
+        @Override
         public BidiMap<V, K> makeObject() {
             return main.makeObject().inverseBidiMap();
         }
 
+        @Override
         public BidiMap<V, K> makeFullMap() {
             return main.makeFullMap().inverseBidiMap();
         }
 
+        @Override
         public V[] getSampleKeys() {
             return main.getSampleValues();
         }
+        @Override
         public K[] getSampleValues() {
             return main.getSampleKeys();
         }
 
+        @Override
         public String getCompatibilityVersion() {
             return main.getCompatibilityVersion();
         }
 
+        @Override
         public boolean isAllowNullKey() {
             return main.isAllowNullKey();
         }
 
+        @Override
         public boolean isAllowNullValue() {
             return main.isAllowNullValue();
         }
 
+        @Override
         public boolean isPutAddSupported() {
             return main.isPutAddSupported();
         }
 
+        @Override
         public boolean isPutChangeSupported() {
             return main.isPutChangeSupported();
         }
 
+        @Override
         public boolean isSetValueSupported() {
             return main.isSetValueSupported();
         }
 
+        @Override
         public boolean isRemoveSupported() {
             return main.isRemoveSupported();
         }
@@ -467,38 +483,46 @@ public abstract class AbstractTestBidiMa
             super("TestBidiMapIterator");
         }
 
+        @Override
         public V[] addSetValues() {
             return AbstractTestBidiMap.this.getNewSampleValues();
         }
 
+        @Override
         public boolean supportsRemove() {
             return AbstractTestBidiMap.this.isRemoveSupported();
         }
 
+        @Override
         public boolean supportsSetValue() {
             return AbstractTestBidiMap.this.isSetValueSupported();
         }
 
+        @Override
         public MapIterator<K, V> makeEmptyIterator() {
             resetEmpty();
             return AbstractTestBidiMap.this.getMap().mapIterator();
         }
 
+        @Override
         public MapIterator<K, V> makeObject() {
             resetFull();
             return AbstractTestBidiMap.this.getMap().mapIterator();
         }
 
+        @Override
         public BidiMap<K, V> getMap() {
             // assumes makeFullMapIterator() called first
             return AbstractTestBidiMap.this.getMap();
         }
 
+        @Override
         public Map<K, V> getConfirmedMap() {
             // assumes makeFullMapIterator() called first
             return AbstractTestBidiMap.this.getConfirmed();
         }
 
+        @Override
         public void verify() {
             super.verify();
             AbstractTestBidiMap.this.verify();

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java Wed Jul 21 17:39:49 2010
@@ -165,38 +165,46 @@ public abstract class AbstractTestOrdere
             super("TestBidiOrderedMapIterator");
         }
 
+        @Override
         public V[] addSetValues() {
             return AbstractTestOrderedBidiMap.this.getNewSampleValues();
         }
 
+        @Override
         public boolean supportsRemove() {
             return AbstractTestOrderedBidiMap.this.isRemoveSupported();
         }
 
+        @Override
         public boolean supportsSetValue() {
             return AbstractTestOrderedBidiMap.this.isSetValueSupported();
         }
 
+        @Override
         public MapIterator<K, V> makeEmptyIterator() {
             resetEmpty();
             return AbstractTestOrderedBidiMap.this.getMap().mapIterator();
         }
 
+        @Override
         public MapIterator<K, V> makeObject() {
             resetFull();
             return AbstractTestOrderedBidiMap.this.getMap().mapIterator();
         }
 
+        @Override
         public Map<K, V> getMap() {
             // assumes makeFullMapIterator() called first
             return AbstractTestOrderedBidiMap.this.map;
         }
 
+        @Override
         public Map<K, V> getConfirmedMap() {
             // assumes makeFullMapIterator() called first
             return AbstractTestOrderedBidiMap.this.confirmed;
         }
 
+        @Override
         public void verify() {
             super.verify();
             AbstractTestOrderedBidiMap.this.verify();

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java Wed Jul 21 17:39:49 2010
@@ -78,10 +78,12 @@ public abstract class AbstractTestSorted
 //    }
 
     //-----------------------------------------------------------------------
+    @Override
     public boolean isAllowNullKey() {
         return false;
     }
 
+    @Override
     public boolean isAllowNullValue() {
         return false;
     }
@@ -100,6 +102,7 @@ public abstract class AbstractTestSorted
         return (SortedBidiMap<K, V>) super.makeFullMap();
     }
 
+    @Override
     public SortedMap<K, V> makeConfirmedMap() {
         return new TreeMap<K, V>();
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java Wed Jul 21 17:39:49 2010
@@ -48,18 +48,22 @@ public class TestAbstractOrderedBidiMapD
         return new TestOrderedBidiMap<K, V>();
     }
 
+    @Override
     public SortedMap<K, V> makeConfirmedMap() {
         return new TreeMap<K, V>();
     }
 
+    @Override
     public boolean isAllowNullKey() {
         return false;
     }
 
+    @Override
     public boolean isAllowNullValue() {
         return false;
     }
 
+    @Override
     public boolean isSetValueSupported() {
         return true;
     }
@@ -79,6 +83,7 @@ public class TestAbstractOrderedBidiMapD
             super(map);
         }
 
+        @Override
         public OrderedBidiMap<V, K> inverseBidiMap() {
             if (inverse == null) {
                 inverse = new TestOrderedBidiMap<V, K>(decorated().inverseBidiMap());

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java Wed Jul 21 17:39:49 2010
@@ -54,6 +54,7 @@ public class TestDualHashBidiMap<K, V> e
     /**
      * Override to prevent infinite recursion of tests.
      */
+    @Override
     public String[] ignoredTests() {
         return new String[] { "TestDualHashBidiMap.bulkTestInverseMap.bulkTestInverseMap" };
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java Wed Jul 21 17:39:49 2010
@@ -54,6 +54,7 @@ public class TestDualTreeBidiMap<K exten
     /**
      * Override to prevent infinite recursion of tests.
      */
+    @Override
     public String[] ignoredTests() {
         return new String[] {"TestDualTreeBidiMap.bulkTestInverseMap.bulkTestInverseMap"};
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java Wed Jul 21 17:39:49 2010
@@ -58,12 +58,14 @@ public class TestDualTreeBidiMap2<K exte
         super(testName);
     }
 
+    @Override
     public DualTreeBidiMap<K, V> makeObject() {
         return new DualTreeBidiMap<K, V>(
                 new ReverseComparator<K>(ComparableComparator.<K> getInstance()),
                 new ReverseComparator<V>(ComparableComparator.<V> getInstance()));
     }
 
+    @Override
     public TreeMap<K, V> makeConfirmedMap() {
         return new TreeMap<K, V>(new ReverseComparator<K>(ComparableComparator.<K>getInstance()));
     }
@@ -114,6 +116,7 @@ public class TestDualTreeBidiMap2<K exte
         }
     }
 
+    @Override
     public String getCompatibilityVersion() {
         return "3.Test2";
     }
@@ -121,6 +124,7 @@ public class TestDualTreeBidiMap2<K exte
     /**
      * Override to prevent infinite recursion of tests.
      */
+    @Override
     public String[] ignoredTests() {
         return new String[] {"TestDualTreeBidiMap2.bulkTestInverseMap.bulkTestInverseMap"};
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java Wed Jul 21 17:39:49 2010
@@ -45,10 +45,12 @@ public class TestTreeBidiMap<K extends C
         super(testName);
     }
 
+    @Override
     public BidiMap<K, V> makeObject() {
         return new TreeBidiMap<K, V>();
     }
     
+    @Override
     public TreeMap<K, V> makeConfirmedMap() {
         return new TreeMap<K, V>();
     }
@@ -56,22 +58,27 @@ public class TestTreeBidiMap<K extends C
     /**
      * Override to prevent infinite recursion of tests.
      */
+    @Override
     public String[] ignoredTests() {
         return new String[] {"TestTreeBidiMap.bulkTestInverseMap.bulkTestInverseMap"};
     }
     
+    @Override
     public boolean isAllowNullKey() {
         return false;
     }
     
+    @Override
     public boolean isAllowNullValue() {
         return false;
     }
     
+    @Override
     public boolean isSetValueSupported() {
         return false;
     }
     
+    @Override
     public String getCompatibilityVersion() {
         return "3.3";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java Wed Jul 21 17:39:49 2010
@@ -46,16 +46,19 @@ public class TestUnmodifiableBidiMap<K, 
         super(testName);
     }
 
+    @Override
     public BidiMap<K, V> makeObject() {
         return UnmodifiableBidiMap.decorate(new DualHashBidiMap<K, V>());
     }
 
+    @Override
     public BidiMap<K, V> makeFullMap() {
         BidiMap<K, V> bidi = new DualHashBidiMap<K, V>();
         addSampleMappings(bidi);
         return UnmodifiableBidiMap.decorate(bidi);
     }
 
+    @Override
     public Map<K, V> makeConfirmedMap() {
         return new HashMap<K, V>();
     }
@@ -63,18 +66,22 @@ public class TestUnmodifiableBidiMap<K, 
     /**
      * Override to prevent infinite recursion of tests.
      */
+    @Override
     public String[] ignoredTests() {
         return new String[] {"TestUnmodifiableBidiMap.bulkTestInverseMap.bulkTestInverseMap"};
     }
 
+    @Override
     public boolean isPutAddSupported() {
         return false;
     }
 
+    @Override
     public boolean isPutChangeSupported() {
         return false;
     }
 
+    @Override
     public boolean isRemoveSupported() {
         return false;
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java Wed Jul 21 17:39:49 2010
@@ -47,16 +47,19 @@ public class TestUnmodifiableOrderedBidi
         super(testName);
     }
 
+    @Override
     public OrderedBidiMap<K, V> makeObject() {
         return UnmodifiableOrderedBidiMap.decorate(new TreeBidiMap<K, V>());
     }
 
+    @Override
     public BidiMap<K, V> makeFullMap() {
         OrderedBidiMap<K, V> bidi = new TreeBidiMap<K, V>();
         addSampleMappings(bidi);
         return UnmodifiableOrderedBidiMap.decorate(bidi);
     }
 
+    @Override
     public Map<K, V> makeConfirmedMap() {
         return new TreeMap<K, V>();
     }
@@ -64,26 +67,32 @@ public class TestUnmodifiableOrderedBidi
     /**
      * Override to prevent infinite recursion of tests.
      */
+    @Override
     public String[] ignoredTests() {
         return new String[] {"TestUnmodifiableOrderedBidiMap.bulkTestInverseMap.bulkTestInverseMap"};
     }
 
+    @Override
     public boolean isAllowNullKey() {
         return false;
     }
 
+    @Override
     public boolean isAllowNullValue() {
         return false;
     }
 
+    @Override
     public boolean isPutAddSupported() {
         return false;
     }
 
+    @Override
     public boolean isPutChangeSupported() {
         return false;
     }
 
+    @Override
     public boolean isRemoveSupported() {
         return false;
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java Wed Jul 21 17:39:49 2010
@@ -47,47 +47,57 @@ public class TestUnmodifiableSortedBidiM
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public SortedBidiMap<K, V> makeObject() {
         return UnmodifiableSortedBidiMap.decorate(new DualTreeBidiMap<K, V>());
     }
 
+    @Override
     public SortedBidiMap<K, V> makeFullMap() {
         SortedBidiMap<K, V> bidi = new DualTreeBidiMap<K, V>();
         addSampleMappings(bidi);
         return UnmodifiableSortedBidiMap.decorate(bidi);
     }
 
+    @Override
     public SortedMap<K, V> makeConfirmedMap() {
         return new TreeMap<K, V>();
     }
 
+    @Override
     public boolean isSubMapViewsSerializable() {
         // TreeMap sub map views have a bug in deserialization.
         return false;
     }
 
+    @Override
     public String[] ignoredTests() {
         // Override to prevent infinite recursion of tests.
         return new String[] {"TestUnmodifiableSortedBidiMap.bulkTestInverseMap.bulkTestInverseMap"};
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public boolean isAllowNullKey() {
         return false;
     }
 
+    @Override
     public boolean isAllowNullValue() {
         return false;
     }
 
+    @Override
     public boolean isPutAddSupported() {
         return false;
     }
 
+    @Override
     public boolean isPutChangeSupported() {
         return false;
     }
 
+    @Override
     public boolean isRemoveSupported() {
         return false;
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java Wed Jul 21 17:39:49 2010
@@ -52,10 +52,12 @@ public class TestBlockingBuffer<E> exten
         junit.textui.TestRunner.main(testCaseName);
     }
 
+    @Override
     public Buffer<E> makeObject() {
         return BlockingBuffer.decorate(new MyBuffer<E>());
     }
 
+    @Override
     public boolean isEqualsCheckable() {
         return false;
     }
@@ -437,6 +439,7 @@ public class TestBlockingBuffer<E> exten
             this.obj = obj;
         }
 
+        @Override
         public void run() {
             try {
                 // wait for other thread to block on get() or remove()
@@ -467,6 +470,7 @@ public class TestBlockingBuffer<E> exten
             this.obj = obj;
         }
 
+        @Override
         public void run() {
             try {
                 // wait for other thread to block on get() or remove()
@@ -517,6 +521,7 @@ public class TestBlockingBuffer<E> exten
             this.action = action;
         }
 
+        @Override
         public void run() {
             try {
                 if (action == "get") {
@@ -544,6 +549,7 @@ public class TestBlockingBuffer<E> exten
             return get(0);
         }
 
+        @Override
         public E remove() {
             if (isEmpty()) {
                 throw new BufferUnderflowException();
@@ -559,6 +565,7 @@ public class TestBlockingBuffer<E> exten
         }
     }
 
+    @Override
     public String getCompatibilityVersion() {
         return "3.1";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java Wed Jul 21 17:39:49 2010
@@ -43,14 +43,17 @@ public class TestBoundedBuffer<E> extend
         junit.textui.TestRunner.main(testCaseName);
     }
 
+    @Override
     public String getCompatibilityVersion() {
         return "3.2";
     }
 
+    @Override
     public boolean isEqualsCheckable() {
         return false;
     }
 
+    @Override
     public Buffer<E> makeObject() {
         return BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), 1);
     }
@@ -183,6 +186,7 @@ public class TestBoundedBuffer<E> extend
             this(buffer, delay, 1);
         }
 
+        @Override
         public void run() {
             try {
                 Thread.sleep(delay);
@@ -215,6 +219,7 @@ public class TestBoundedBuffer<E> extend
             this(buffer, delay, 1);
         }
 
+        @Override
         public void run() {
             try {
                 Thread.sleep(delay);

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java Wed Jul 21 17:39:49 2010
@@ -49,6 +49,7 @@ public class TestBoundedFifoBuffer<E> ex
      *  the buffer contains the same elements in the same sequence as the
      *  list.
      */
+    @Override
     public void verify() {
         super.verify();
         Iterator<E> iterator1 = getCollection().iterator();
@@ -66,6 +67,7 @@ public class TestBoundedFifoBuffer<E> ex
      * Overridden because UnboundedFifoBuffer doesn't allow null elements.
      * @return false
      */
+    @Override
     public boolean isNullSupported() {
         return false;
     }
@@ -74,6 +76,7 @@ public class TestBoundedFifoBuffer<E> ex
      * Overridden because UnboundedFifoBuffer isn't fail fast.
      * @return false
      */
+    @Override
     public boolean isFailFastSupported() {
         return false;
     }
@@ -84,6 +87,7 @@ public class TestBoundedFifoBuffer<E> ex
      *
      *  @return an empty ArrayList
      */
+    @Override
     public List<E> makeConfirmedCollection() {
         return new ArrayList<E>();
     }
@@ -93,6 +97,7 @@ public class TestBoundedFifoBuffer<E> ex
      *
      *  @return a full ArrayList
      */
+    @Override
     public List<E> makeConfirmedFullCollection() {
         List<E> c = makeConfirmedCollection();
         c.addAll(java.util.Arrays.asList(getFullElements()));
@@ -104,6 +109,7 @@ public class TestBoundedFifoBuffer<E> ex
      *
      *  @return an empty BoundedFifoBuffer
      */
+    @Override
     public BoundedFifoBuffer<E> makeObject() {
         return new BoundedFifoBuffer<E>(100);
     }
@@ -166,6 +172,7 @@ public class TestBoundedFifoBuffer<E> ex
         fail();
     }
 
+    @Override
     public String getCompatibilityVersion() {
         return "3.1";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java Wed Jul 21 17:39:49 2010
@@ -49,6 +49,7 @@ public class TestBoundedFifoBuffer2<E> e
      *
      *  @return a full BoundedFifoBuffer
      */
+    @Override
     public Collection<E> makeFullCollection() {
         return new BoundedFifoBuffer<E>(Arrays.asList(getFullElements()));
     }
@@ -59,6 +60,7 @@ public class TestBoundedFifoBuffer2<E> e
      *
      *  @return false
      */
+    @Override
     public boolean isAddSupported() {
         return false;
     }
@@ -67,6 +69,7 @@ public class TestBoundedFifoBuffer2<E> e
      *  Overridden because the add operations raise BufferOverflowException
      *  instead of UnsupportedOperationException.
      */
+    @Override
     public void testUnsupportedAdd() {
     }
 

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java Wed Jul 21 17:39:49 2010
@@ -60,6 +60,7 @@ public class TestCircularFifoBuffer<E> e
      *  the buffer contains the same elements in the same sequence as the
      *  list.
      */
+    @Override
     public void verify() {
         super.verify();
         Iterator<E> iterator1 = getCollection().iterator();
@@ -77,6 +78,7 @@ public class TestCircularFifoBuffer<E> e
      * Overridden because UnboundedFifoBuffer doesn't allow null elements.
      * @return false
      */
+    @Override
     public boolean isNullSupported() {
         return false;
     }
@@ -85,6 +87,7 @@ public class TestCircularFifoBuffer<E> e
      * Overridden because UnboundedFifoBuffer isn't fail fast.
      * @return false
      */
+    @Override
     public boolean isFailFastSupported() {
         return false;
     }
@@ -95,6 +98,7 @@ public class TestCircularFifoBuffer<E> e
      *
      * @return an empty ArrayList
      */
+    @Override
     public Collection<E> makeConfirmedCollection() {
         return new ArrayList<E>();
     }
@@ -104,6 +108,7 @@ public class TestCircularFifoBuffer<E> e
      *
      * @return a full ArrayList
      */
+    @Override
     public Collection<E> makeConfirmedFullCollection() {
         Collection<E> c = makeConfirmedCollection();
         c.addAll(java.util.Arrays.asList(getFullElements()));
@@ -115,6 +120,7 @@ public class TestCircularFifoBuffer<E> e
      *
      * @return an empty BoundedFifoBuffer
      */
+    @Override
     public Collection<E> makeObject() {
         return new CircularFifoBuffer<E>(100);
     }
@@ -415,6 +421,7 @@ public class TestCircularFifoBuffer<E> e
         assertEquals(true, b3.contains("c"));
     }
 
+    @Override
     public String getCompatibilityVersion() {
         return "3.1";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java Wed Jul 21 17:39:49 2010
@@ -57,14 +57,17 @@ public class TestPredicatedBuffer<E> ext
         return PredicatedBuffer.decorate(buffer, predicate);
     }
 
+    @Override
     public Buffer<E> makeObject() {
         return decorateCollection(new ArrayStack<E>(), truePredicate);
     }
 
+    @Override
     public Collection<E> makeConfirmedCollection() {
         return new ArrayStack<E>();
     }
 
+    @Override
     public Collection<E> makeConfirmedFullCollection() {
         ArrayStack<E> list = new ArrayStack<E>();
         list.addAll(java.util.Arrays.asList(getFullElements()));
@@ -105,6 +108,7 @@ public class TestPredicatedBuffer<E> ext
         }
     }
 
+    @Override
     public String getCompatibilityVersion() {
         return "3.1";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java Wed Jul 21 17:39:49 2010
@@ -57,6 +57,7 @@ public class TestPriorityBuffer<E> exten
     }
 
     //-----------------------------------------------------------------------
+    @Override
     @SuppressWarnings("unchecked")
     public void verify() {
         super.verify();
@@ -87,15 +88,18 @@ public class TestPriorityBuffer<E> exten
      * Overridden because BinaryBuffer isn't fail fast.
      * @return false
      */
+    @Override
     public boolean isFailFastSupported() {
         return false;
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public Collection<E> makeConfirmedCollection() {
         return new ArrayList<E>();
     }
 
+    @Override
     public Collection<E> makeConfirmedFullCollection() {
         ArrayList<E> list = new ArrayList<E>();
         list.addAll(Arrays.asList(getFullElements()));
@@ -105,16 +109,19 @@ public class TestPriorityBuffer<E> exten
     /**
      * Return a new, empty {@link Object} to used for testing.
      */
+    @Override
     public Buffer<E> makeObject() {
         return new PriorityBuffer<E>();
     }
 
     //-----------------------------------------------------------------------
+    @Override
     @SuppressWarnings("unchecked")
     public E[] getFullElements() {
         return (E[]) getFullNonNullStringElements();
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public E[] getOtherElements() {
         return (E[]) getOtherNonNullStringElements();
@@ -399,6 +406,7 @@ public class TestPriorityBuffer<E> exten
         return h1;
     }
 
+    @Override
     public String getCompatibilityVersion() {
         return "3.2";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java Wed Jul 21 17:39:49 2010
@@ -52,30 +52,36 @@ public class TestSynchronizedBuffer<E> e
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public Buffer<E> makeObject() {
         return SynchronizedBuffer.decorate(new UnboundedFifoBuffer<E>());
     }
 
+    @Override
     public Collection<E> makeFullCollection() {
         Buffer<E> buffer = new UnboundedFifoBuffer<E>();
         buffer.addAll(Arrays.asList(getFullElements()));
         return SynchronizedBuffer.decorate(buffer);
     }
 
+    @Override
     public Collection<E> makeConfirmedCollection() {
         return new ArrayStack<E>();
     }
 
+    @Override
     public Collection<E> makeConfirmedFullCollection() {
         ArrayStack<E> list = new ArrayStack<E>();
         list.addAll(Arrays.asList(getFullElements()));
         return list;
     }
 
+    @Override
     public boolean isNullSupported() {
         return false;
     }
 
+    @Override
     public String getCompatibilityVersion() {
         return "3.1";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java Wed Jul 21 17:39:49 2010
@@ -48,6 +48,7 @@ public class TestUnboundedFifoBuffer<E> 
      *  Verifies that the ArrayList has the same elements in the same 
      *  sequence as the UnboundedFifoBuffer.
      */
+    @Override
     public void verify() {
         super.verify();
         Iterator<E> iterator1 = getCollection().iterator();
@@ -65,6 +66,7 @@ public class TestUnboundedFifoBuffer<E> 
      * Overridden because UnboundedFifoBuffer doesn't allow null elements.
      * @return false
      */
+    @Override
     public boolean isNullSupported() {
         return false;
     }
@@ -73,6 +75,7 @@ public class TestUnboundedFifoBuffer<E> 
      * Overridden because UnboundedFifoBuffer isn't fail fast.
      * @return false
      */
+    @Override
     public boolean isFailFastSupported() {
         return false;
     }
@@ -83,6 +86,7 @@ public class TestUnboundedFifoBuffer<E> 
      *
      *  @return an empty ArrayList
      */
+    @Override
     public Collection<E> makeConfirmedCollection() {
         return new ArrayList<E>();
     }
@@ -92,6 +96,7 @@ public class TestUnboundedFifoBuffer<E> 
      *
      *  @return a full ArrayList
      */
+    @Override
     public Collection<E> makeConfirmedFullCollection() {
         Collection<E> c = makeConfirmedCollection();
         c.addAll(java.util.Arrays.asList(getFullElements()));
@@ -103,6 +108,7 @@ public class TestUnboundedFifoBuffer<E> 
      *
      *  @return an empty UnboundedFifoBuffer
      */
+    @Override
     public Collection<E> makeObject() {
         return new UnboundedFifoBuffer<E>(5);
     }
@@ -437,6 +443,7 @@ public class TestUnboundedFifoBuffer<E> 
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public String getCompatibilityVersion() {
         return "3.1";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java Wed Jul 21 17:39:49 2010
@@ -52,34 +52,41 @@ public class TestUnmodifiableBuffer<E> e
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public Collection<E> makeObject() {
         return UnmodifiableBuffer.decorate(new UnboundedFifoBuffer<E>());
     }
 
+    @Override
     public Collection<E> makeFullCollection() {
         Buffer<E> buffer = new UnboundedFifoBuffer<E>();
         buffer.addAll(Arrays.asList(getFullElements()));
         return UnmodifiableBuffer.decorate(buffer);
     }
 
+    @Override
     public Collection<E> makeConfirmedCollection() {
         return new ArrayStack<E>();
     }
 
+    @Override
     public Collection<E> makeConfirmedFullCollection() {
         ArrayStack<E> list = new ArrayStack<E>();
         list.addAll(Arrays.asList(getFullElements()));
         return list;
     }
 
+    @Override
     public boolean isAddSupported() {
         return false;
     }
 
+    @Override
     public boolean isRemoveSupported() {
         return false;
     }
 
+    @Override
     public boolean isNullSupported() {
         return false;
     }
@@ -92,6 +99,7 @@ public class TestUnmodifiableBuffer<E> e
         } catch (UnsupportedOperationException ex) {}
     }
 
+    @Override
     public String getCompatibilityVersion() {
         return "3.1";
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java Wed Jul 21 17:39:49 2010
@@ -232,6 +232,7 @@ public abstract class AbstractTestCollec
      * Returns true to indicate that the collection supports equals() comparisons.
      * This implementation returns false;
      */
+    @Override
     public boolean isEqualsCheckable() {
         return false;
     }
@@ -352,6 +353,7 @@ public abstract class AbstractTestCollec
     /**
      * Return a new, empty {@link Collection} to be used for testing.
      */
+    @Override
     public abstract Collection<E> makeObject();
 
     /**
@@ -1248,6 +1250,7 @@ public abstract class AbstractTestCollec
         }
     }
 
+    @Override
     public void testSerializeDeserializeThenCompare() throws Exception {
         Object obj = makeObject();
         if (obj instanceof Serializable && isTestSerialization()) {



Mime
View raw message