commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r966327 [2/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/keyvalue/TiedMapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java Wed Jul 21 17:39:49 2010
@@ -97,6 +97,7 @@ public class TiedMapEntry<K, V> implemen
      * @param obj  the object to compare to
      * @return true if equal key and value
      */
+    @Override
     @SuppressWarnings("unchecked")
     public boolean equals(Object obj) {
         if (obj == this) {
@@ -119,6 +120,7 @@ public class TiedMapEntry<K, V> implemen
      * 
      * @return a suitable hash code
      */
+    @Override
     public int hashCode() {
         Object value = getValue();
         return (getKey() == null ? 0 : getKey().hashCode()) ^
@@ -130,6 +132,7 @@ public class TiedMapEntry<K, V> implemen
      * 
      * @return entry as a string
      */
+    @Override
     public String toString() {
         return getKey() + "=" + getValue();
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java Wed Jul 21 17:39:49 2010
@@ -69,6 +69,7 @@ public final class UnmodifiableMapEntry<
      * @return the previous value
      * @throws UnsupportedOperationException always
      */
+    @Override
     public V setValue(V value) {
         throw new UnsupportedOperationException("setValue() is not supported");
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/AbstractLinkedList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/AbstractLinkedList.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/AbstractLinkedList.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/AbstractLinkedList.java Wed Jul 21 17:39:49 2010
@@ -325,6 +325,7 @@ public abstract class AbstractLinkedList
     }
 
     //-----------------------------------------------------------------------
+    @Override
     @SuppressWarnings("unchecked")
     public boolean equals(Object obj) {
         if (obj == this) {
@@ -348,6 +349,7 @@ public abstract class AbstractLinkedList
         return !(it1.hasNext() || it2.hasNext());
     }
 
+    @Override
     public int hashCode() {
         int hashCode = 1;
         for (E e : this) {
@@ -356,6 +358,7 @@ public abstract class AbstractLinkedList
         return hashCode;
     }
 
+    @Override
     public String toString() {
         if (size() == 0) {
             return "[]";
@@ -863,24 +866,29 @@ public abstract class AbstractLinkedList
             this.sub = sub;
         }
 
+        @Override
         public boolean hasNext() {
             return (nextIndex() < sub.size);
         }
 
+        @Override
         public boolean hasPrevious() {
             return (previousIndex() >= 0);
         }
 
+        @Override
         public int nextIndex() {
             return (super.nextIndex() - sub.offset);
         }
 
+        @Override
         public void add(E obj) {
             super.add(obj);
             sub.expectedModCount = parent.modCount;
             sub.size++;
         }
 
+        @Override
         public void remove() {
             super.remove();
             sub.expectedModCount = parent.modCount;
@@ -918,17 +926,20 @@ public abstract class AbstractLinkedList
             this.expectedModCount = parent.modCount;
         }
 
+        @Override
         public int size() {
             checkModCount();
             return size;
         }
 
+        @Override
         public E get(int index) {
             rangeCheck(index, size);
             checkModCount();
             return parent.get(index + offset);
         }
 
+        @Override
         public void add(int index, E obj) {
             rangeCheck(index, size + 1);
             checkModCount();
@@ -938,6 +949,7 @@ public abstract class AbstractLinkedList
             LinkedSubList.this.modCount++;
         }
 
+        @Override
         public E remove(int index) {
             rangeCheck(index, size);
             checkModCount();
@@ -948,10 +960,12 @@ public abstract class AbstractLinkedList
             return result;
         }
 
+        @Override
         public boolean addAll(Collection<? extends E> coll) {
             return addAll(size, coll);
         }
 
+        @Override
         public boolean addAll(int index, Collection<? extends E> coll) {
             rangeCheck(index, size + 1);
             int cSize = coll.size();
@@ -967,12 +981,14 @@ public abstract class AbstractLinkedList
             return true;
         }
 
+        @Override
         public E set(int index, E obj) {
             rangeCheck(index, size);
             checkModCount();
             return parent.set(index + offset, obj);
         }
 
+        @Override
         public void clear() {
             checkModCount();
             Iterator<E> it = iterator();
@@ -982,17 +998,20 @@ public abstract class AbstractLinkedList
             }
         }
 
+        @Override
         public Iterator<E> iterator() {
             checkModCount();
             return parent.createSubListIterator(this);
         }
 
+        @Override
         public ListIterator<E> listIterator(final int index) {
             rangeCheck(index, size + 1);
             checkModCount();
             return parent.createSubListListIterator(this, index);
         }
 
+        @Override
         public List<E> subList(int fromIndexInclusive, int toIndexExclusive) {
             return new LinkedSubList<E>(parent, fromIndexInclusive + offset, toIndexExclusive + offset);
         }

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

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/GrowthList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/GrowthList.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/GrowthList.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/GrowthList.java Wed Jul 21 17:39:49 2010
@@ -117,6 +117,7 @@ public class GrowthList<E> extends Abstr
      * @throws ClassCastException if the underlying list rejects the element
      * @throws IllegalArgumentException if the underlying list rejects the element
      */
+    @Override
     public void add(int index, E element) {
         int size = decorated().size();
         if (index > size) {
@@ -145,6 +146,7 @@ public class GrowthList<E> extends Abstr
      * @throws ClassCastException if the underlying list rejects the element
      * @throws IllegalArgumentException if the underlying list rejects the element
      */
+    @Override
     public boolean addAll(int index, Collection<? extends E> coll) {
         int size = decorated().size();
         boolean result = false;
@@ -175,6 +177,7 @@ public class GrowthList<E> extends Abstr
      * @throws ClassCastException if the underlying list rejects the element
      * @throws IllegalArgumentException if the underlying list rejects the element
      */
+    @Override
     public E set(int index, E element) {
         int size = decorated().size();
         if (index >= size) {

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/LazyList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/LazyList.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/LazyList.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/LazyList.java Wed Jul 21 17:39:49 2010
@@ -107,6 +107,7 @@ public class LazyList<E> extends Abstrac
      * 
      * @param index  the index to retrieve
      */
+    @Override
     public E get(int index) {
         int size = decorated().size();
         if (index < size) {
@@ -131,6 +132,7 @@ public class LazyList<E> extends Abstrac
         return object;
     }
 
+    @Override
     public List<E> subList(int fromIndex, int toIndex) {
         List<E> sub = decorated().subList(fromIndex, toIndex);
         return new LazyList<E>(sub, factory);

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java Wed Jul 21 17:39:49 2010
@@ -186,6 +186,7 @@ public class NodeCachingLinkedList<E> ex
      * @param value  value of the new node
      * @return the newly created node
      */
+    @Override
     protected Node<E> createNode(E value) {
         Node<E> cachedNode = getNodeFromCache();
         if (cachedNode == null) {
@@ -201,6 +202,7 @@ public class NodeCachingLinkedList<E> ex
      * 
      * @param node  the node to remove
      */
+    @Override
     protected void removeNode(Node<E> node) {
         super.removeNode(node);
         addNodeToCache(node);
@@ -211,6 +213,7 @@ public class NodeCachingLinkedList<E> ex
      * cache for reuse.
      * 
      */
+    @Override
     protected void removeAllNodes() {
         // Add the removed nodes to the cache, then remove the rest.
         // We can add them to the cache before removing them, since

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/SetUniqueList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/SetUniqueList.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/SetUniqueList.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/SetUniqueList.java Wed Jul 21 17:39:49 2010
@@ -124,6 +124,7 @@ public class SetUniqueList<E> extends Ab
      * @param object the object to add
      * @return true if object was added
      */
+    @Override
     public boolean add(E object) {
         // gets initial size
         final int sizeBefore = size();
@@ -145,6 +146,7 @@ public class SetUniqueList<E> extends Ab
      * @param index  the index to insert at
      * @param object  the object to add
      */
+    @Override
     public void add(int index, E object) {
         // adds element if it is not contained already
         if (set.contains(object) == false) {
@@ -166,6 +168,7 @@ public class SetUniqueList<E> extends Ab
      * @param coll  the collection to add in iterator order
      * @return true if this collection changed
      */
+    @Override
     public boolean addAll(Collection<? extends E> coll) {
         return addAll(size(), coll);
     }
@@ -185,6 +188,7 @@ public class SetUniqueList<E> extends Ab
      * @param coll  the collection to add in iterator order
      * @return true if this collection changed
      */
+    @Override
     public boolean addAll(int index, Collection<? extends E> coll) {
         HashSet<E> temp = new HashSet<E>(coll);
         temp.removeAll(set);
@@ -213,6 +217,7 @@ public class SetUniqueList<E> extends Ab
      * @param object  the object to set
      * @return the previous object
      */
+    @Override
     public E set(int index, E object) {
         int pos = indexOf(object);
         E removed = super.set(index, object);
@@ -229,55 +234,66 @@ public class SetUniqueList<E> extends Ab
         return removed;  // return the item deleted by the set
     }
 
+    @Override
     public boolean remove(Object object) {
         boolean result = super.remove(object);
         set.remove(object);
         return result;
     }
 
+    @Override
     public E remove(int index) {
         E result = super.remove(index);
         set.remove(result);
         return result;
     }
 
+    @Override
     public boolean removeAll(Collection<?> coll) {
         boolean result = super.removeAll(coll);
         set.removeAll(coll);
         return result;
     }
 
+    @Override
     public boolean retainAll(Collection<?> coll) {
         boolean result = super.retainAll(coll);
         set.retainAll(coll);
         return result;
     }
 
+    @Override
     public void clear() {
         super.clear();
         set.clear();
     }
 
+    @Override
     public boolean contains(Object object) {
         return set.contains(object);
     }
 
+    @Override
     public boolean containsAll(Collection<?> coll) {
         return set.containsAll(coll);
     }
 
+    @Override
     public Iterator<E> iterator() {
         return new SetListIterator<E>(super.iterator(), set);
     }
 
+    @Override
     public ListIterator<E> listIterator() {
         return new SetListListIterator<E>(super.listIterator(), set);
     }
 
+    @Override
     public ListIterator<E> listIterator(int index) {
         return new SetListListIterator<E>(super.listIterator(index), set);
     }
 
+    @Override
     public List<E> subList(int fromIndex, int toIndex) {
         List<E> superSubList = super.subList(fromIndex, toIndex);
         Set<E> subSet = createSetBasedOnList(set, superSubList);
@@ -316,11 +332,13 @@ public class SetUniqueList<E> extends Ab
             this.set = set;
         }
 
+        @Override
         public E next() {
             last = super.next();
             return last;
         }
 
+        @Override
         public void remove() {
             super.remove();
             set.remove(last);
@@ -341,22 +359,26 @@ public class SetUniqueList<E> extends Ab
             this.set = set;
         }
 
+        @Override
         public E next() {
             last = super.next();
             return last;
         }
 
+        @Override
         public E previous() {
             last = super.previous();
             return last;
         }
 
+        @Override
         public void remove() {
             super.remove();
             set.remove(last);
             last = null;
         }
 
+        @Override
         public void add(E object) {
             if (set.contains(object) == false) {
                 super.add(object);
@@ -364,6 +386,7 @@ public class SetUniqueList<E> extends Ab
             }
         }
 
+        @Override
         public void set(E object) {
             throw new UnsupportedOperationException("ListIterator does not support set");
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/TransformedList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/TransformedList.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/TransformedList.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/TransformedList.java Wed Jul 21 17:39:49 2010
@@ -165,11 +165,13 @@ public class TransformedList<E> extends 
             super(iterator);
         }
 
+        @Override
         public void add(E object) {
             object = transform(object);
             iterator.add(object);
         }
 
+        @Override
         public void set(E object) {
             object = transform(object);
             iterator.set(object);

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/TreeList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/TreeList.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/TreeList.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/TreeList.java Wed Jul 21 17:39:49 2010
@@ -94,6 +94,7 @@ public class TreeList<E> extends Abstrac
      * @param index  the index to retrieve
      * @return the element at the specified index
      */
+    @Override
     public E get(int index) {
         checkInterval(index, 0, size() - 1);
         return root.get(index).getValue();
@@ -104,6 +105,7 @@ public class TreeList<E> extends Abstrac
      *
      * @return the current size
      */
+    @Override
     public int size() {
         return size;
     }
@@ -113,6 +115,7 @@ public class TreeList<E> extends Abstrac
      *
      * @return an iterator over the list
      */
+    @Override
     public Iterator<E> iterator() {
         // override to go 75% faster
         return listIterator(0);
@@ -123,6 +126,7 @@ public class TreeList<E> extends Abstrac
      *
      * @return the new iterator
      */
+    @Override
     public ListIterator<E> listIterator() {
         // override to go 75% faster
         return listIterator(0);
@@ -134,6 +138,7 @@ public class TreeList<E> extends Abstrac
      * @param fromIndex  the index to start from
      * @return the new iterator
      */
+    @Override
     public ListIterator<E> listIterator(int fromIndex) {
         // override to go 75% faster
         // cannot use EmptyIterator as iterator.add() must work
@@ -146,6 +151,7 @@ public class TreeList<E> extends Abstrac
      *
      * @return the index of the object, -1 if not found
      */
+    @Override
     public int indexOf(Object object) {
         // override to go 75% faster
         if (root == null) {
@@ -159,6 +165,7 @@ public class TreeList<E> extends Abstrac
      *
      * @return true if the object is found
      */
+    @Override
     public boolean contains(Object object) {
         return (indexOf(object) >= 0);
     }
@@ -168,6 +175,7 @@ public class TreeList<E> extends Abstrac
      *
      * @return the list as an array
      */
+    @Override
     public Object[] toArray() {
         // override to go 20% faster
         Object[] array = new Object[size()];
@@ -184,6 +192,7 @@ public class TreeList<E> extends Abstrac
      * @param index  the index to add before
      * @param obj  the element to add
      */
+    @Override
     public void add(int index, E obj) {
         modCount++;
         checkInterval(index, 0, size());
@@ -203,6 +212,7 @@ public class TreeList<E> extends Abstrac
      * @return the previous object at that index
      * @throws IndexOutOfBoundsException if the index is invalid
      */
+    @Override
     public E set(int index, E obj) {
         checkInterval(index, 0, size() - 1);
         AVLNode<E> node = root.get(index);
@@ -217,6 +227,7 @@ public class TreeList<E> extends Abstrac
      * @param index  the index to remove
      * @return the previous object at that index
      */
+    @Override
     public E remove(int index) {
         modCount++;
         checkInterval(index, 0, size() - 1);
@@ -229,6 +240,7 @@ public class TreeList<E> extends Abstrac
     /**
      * Clears the list, removing all entries.
      */
+    @Override
     public void clear() {
         modCount++;
         root = null;
@@ -763,6 +775,7 @@ public class TreeList<E> extends Abstrac
         /**
          * Used for debugging.
          */
+        @Override
         public String toString() {
             return "AVLNode(" + relativePosition + "," + (left != null) + "," + value +
                 "," + (getRightSubTree() != null) + ", faedelung " + rightIsNext + " )";

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/UnmodifiableList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/UnmodifiableList.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/UnmodifiableList.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/UnmodifiableList.java Wed Jul 21 17:39:49 2010
@@ -70,59 +70,73 @@ public final class UnmodifiableList<E>
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public Iterator<E> iterator() {
         return UnmodifiableIterator.decorate(decorated().iterator());
     }
 
+    @Override
     public boolean add(Object 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 ListIterator<E> listIterator() {
         return UnmodifiableListIterator.decorate(decorated().listIterator());
     }
 
+    @Override
     public ListIterator<E> listIterator(int index) {
         return UnmodifiableListIterator.decorate(decorated().listIterator(index));
     }
 
+    @Override
     public void add(int index, E object) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean addAll(int index, Collection<? extends E> coll) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public E remove(int index) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public E set(int index, E object) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public List<E> subList(int fromIndex, int toIndex) {
         List<E> sub = decorated().subList(fromIndex, toIndex);
         return new UnmodifiableList<E>(sub);

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractHashedMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractHashedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractHashedMap.java Wed Jul 21 17:39:49 2010
@@ -179,6 +179,7 @@ public class AbstractHashedMap<K, V> ext
      * @param key  the key
      * @return the mapped value, null if no match
      */
+    @Override
     public V get(Object key) {
         key = convertKey(key);
         int hashCode = hash(key);
@@ -197,6 +198,7 @@ public class AbstractHashedMap<K, V> ext
      *
      * @return the size
      */
+    @Override
     public int size() {
         return size;
     }
@@ -206,6 +208,7 @@ public class AbstractHashedMap<K, V> ext
      *
      * @return true if the map is currently size zero
      */
+    @Override
     public boolean isEmpty() {
         return (size == 0);
     }
@@ -217,6 +220,7 @@ public class AbstractHashedMap<K, V> ext
      * @param key  the key to search for
      * @return true if the map contains the key
      */
+    @Override
     public boolean containsKey(Object key) {
         key = convertKey(key);
         int hashCode = hash(key);
@@ -236,6 +240,7 @@ public class AbstractHashedMap<K, V> ext
      * @param value  the value to search for
      * @return true if the map contains the value
      */
+    @Override
     public boolean containsValue(Object value) {
         if (value == null) {
             for (int i = 0, isize = data.length; i < isize; i++) {
@@ -269,6 +274,7 @@ public class AbstractHashedMap<K, V> ext
      * @param value  the value to add
      * @return the value previously mapped to this key, null if none
      */
+    @Override
     public V put(K key, V value) {
         Object convertedKey = convertKey(key);
         int hashCode = hash(convertedKey);
@@ -296,6 +302,7 @@ public class AbstractHashedMap<K, V> ext
      * @param map  the map to add
      * @throws NullPointerException if the map is null
      */
+    @Override
     public void putAll(Map<? extends K, ? extends V> map) {
         _putAll(map);
     }
@@ -330,6 +337,7 @@ public class AbstractHashedMap<K, V> ext
      * @param key  the mapping to remove
      * @return the value mapped to the removed key, null if key not in map
      */
+    @Override
     public V remove(Object key) {
         key = convertKey(key);
         int hashCode = hash(key);
@@ -352,6 +360,7 @@ public class AbstractHashedMap<K, V> ext
      * Clears the map, resetting the size to zero and nullifying references
      * to avoid garbage collection issues.
      */
+    @Override
     public void clear() {
         modCount++;
         HashEntry<K, V>[] data = this.data;
@@ -799,6 +808,7 @@ public class AbstractHashedMap<K, V> ext
      *
      * @return the entrySet view
      */
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
         if (entrySet == null) {
             entrySet = new EntrySet<K, V>(this);
@@ -831,14 +841,17 @@ public class AbstractHashedMap<K, V> ext
             this.parent = parent;
         }
 
+        @Override
         public int size() {
             return parent.size();
         }
 
+        @Override
         public void clear() {
             parent.clear();
         }
 
+        @Override
         public boolean contains(Object entry) {
             if (entry instanceof Map.Entry) {
                 Map.Entry<?, ?> e = (Map.Entry<?, ?>) entry;
@@ -848,6 +861,7 @@ public class AbstractHashedMap<K, V> ext
             return false;
         }
 
+        @Override
         public boolean remove(Object obj) {
             if (obj instanceof Map.Entry == false) {
                 return false;
@@ -860,6 +874,7 @@ public class AbstractHashedMap<K, V> ext
             return true;
         }
 
+        @Override
         public Iterator<Map.Entry<K, V>> iterator() {
             return parent.createEntrySetIterator();
         }
@@ -887,6 +902,7 @@ public class AbstractHashedMap<K, V> ext
      *
      * @return the keySet view
      */
+    @Override
     public Set<K> keySet() {
         if (keySet == null) {
             keySet = new KeySet<K>(this);
@@ -919,24 +935,29 @@ public class AbstractHashedMap<K, V> ext
             this.parent = parent;
         }
 
+        @Override
         public int size() {
             return parent.size();
         }
 
+        @Override
         public void clear() {
             parent.clear();
         }
 
+        @Override
         public boolean contains(Object key) {
             return parent.containsKey(key);
         }
 
+        @Override
         public boolean remove(Object key) {
             boolean result = parent.containsKey(key);
             parent.remove(key);
             return result;
         }
 
+        @Override
         public Iterator<K> iterator() {
             return parent.createKeySetIterator();
         }
@@ -965,6 +986,7 @@ public class AbstractHashedMap<K, V> ext
      *
      * @return the values view
      */
+    @Override
     public Collection<V> values() {
         if (values == null) {
             values = new Values<V>(this);
@@ -997,18 +1019,22 @@ public class AbstractHashedMap<K, V> ext
             this.parent = parent;
         }
 
+        @Override
         public int size() {
             return parent.size();
         }
 
+        @Override
         public void clear() {
             parent.clear();
         }
 
+        @Override
         public boolean contains(Object value) {
             return parent.containsValue(value);
         }
 
+        @Override
         public Iterator<V> iterator() {
             return parent.createValuesIterator();
         }
@@ -1076,6 +1102,7 @@ public class AbstractHashedMap<K, V> ext
             return (V) old;
         }
 
+        @Override
         public boolean equals(Object obj) {
             if (obj == this) {
                 return true;
@@ -1089,11 +1116,13 @@ public class AbstractHashedMap<K, V> ext
                 (getValue() == null ? other.getValue() == null : getValue().equals(other.getValue()));
         }
 
+        @Override
         public int hashCode() {
             return (getKey() == null ? 0 : getKey().hashCode()) ^
                    (getValue() == null ? 0 : getValue().hashCode());
         }
 
+        @Override
         public String toString() {
             return new StringBuilder().append(getKey()).append('=').append(getValue()).toString();
         }
@@ -1169,6 +1198,7 @@ public class AbstractHashedMap<K, V> ext
             expectedModCount = parent.modCount;
         }
 
+        @Override
         public String toString() {
             if (last != null) {
                 return "Iterator[" + last.getKey() + "=" + last.getValue() + "]";
@@ -1249,6 +1279,7 @@ public class AbstractHashedMap<K, V> ext
      *
      * @return a shallow clone
      */
+    @Override
     @SuppressWarnings("unchecked")
     protected AbstractHashedMap<K, V> clone() {
         try {
@@ -1273,6 +1304,7 @@ public class AbstractHashedMap<K, V> ext
      * @param obj  the object to compare to
      * @return true if equal
      */
+    @Override
     @SuppressWarnings("unchecked")
     public boolean equals(Object obj) {
         if (obj == this) {
@@ -1313,6 +1345,7 @@ public class AbstractHashedMap<K, V> ext
      *
      * @return the hash code defined in the Map interface
      */
+    @Override
     public int hashCode() {
         int total = 0;
         Iterator<Map.Entry<K, V>> it = createEntrySetIterator();
@@ -1327,6 +1360,7 @@ public class AbstractHashedMap<K, V> ext
      *
      * @return a string version of the map
      */
+    @Override
     public String toString() {
         if (size() == 0) {
             return "{}";

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java Wed Jul 21 17:39:49 2010
@@ -96,6 +96,7 @@ abstract class AbstractInputCheckedMapDe
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
         if (isSetValueChecking()) {
             return new EntrySet(map.entrySet(), this);
@@ -118,10 +119,12 @@ abstract class AbstractInputCheckedMapDe
             this.parent = parent;
         }
 
+        @Override
         public Iterator<Map.Entry<K, V>> iterator() {
             return new EntrySetIterator(collection.iterator(), parent);
         }
         
+        @Override
         @SuppressWarnings("unchecked")
         public Object[] toArray() {
             Object[] array = collection.toArray();
@@ -131,6 +134,7 @@ abstract class AbstractInputCheckedMapDe
             return array;
         }
         
+        @Override
         @SuppressWarnings("unchecked")
         public <T> T[] toArray(T[] array) {
             Object[] result = array;
@@ -171,6 +175,7 @@ abstract class AbstractInputCheckedMapDe
             this.parent = parent;
         }
 
+        @Override
         public Map.Entry<K, V> next() {
             Map.Entry<K, V> entry = iterator.next();
             return new MapEntry(entry, parent);
@@ -190,6 +195,7 @@ abstract class AbstractInputCheckedMapDe
             this.parent = parent;
         }
 
+        @Override
         public V setValue(V value) {
             value = parent.checkSetValue(value);
             return entry.setValue(value);

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java Wed Jul 21 17:39:49 2010
@@ -125,6 +125,7 @@ public abstract class AbstractLinkedMap<
      * {@link #createEntry(HashEntry, int, Object, Object)} to create
      * the map entry object.
      */
+    @Override
     protected void init() {
         header = createEntry(null, -1, null, null);
         header.before = header.after = header;
@@ -137,6 +138,7 @@ public abstract class AbstractLinkedMap<
      * @param value  the value to search for
      * @return true if the map contains the value
      */
+    @Override
     public boolean containsValue(Object value) {
         // override uses faster iterator
         if (value == null) {
@@ -159,6 +161,7 @@ public abstract class AbstractLinkedMap<
      * Clears the map, resetting the size to zero and nullifying references
      * to avoid garbage collection issues.
      */
+    @Override
     public void clear() {
         // override to reset the linked list
         super.clear();
@@ -201,6 +204,7 @@ public abstract class AbstractLinkedMap<
         return (entry == null || entry.after == header ? null : entry.after.getKey());
     }
 
+    @Override
     protected LinkEntry<K, V> getEntry(Object key) {
         return (LinkEntry<K, V>) super.getEntry(key);
     }
@@ -257,6 +261,7 @@ public abstract class AbstractLinkedMap<
      * @param link  the entry to add
      * @param hashIndex  the index into the data array to store at
      */
+    @Override
     protected void addEntry(HashEntry<K, V> entry, int hashIndex) {
         LinkEntry<K, V> link = (LinkEntry<K, V>) entry;
         link.after  = header;
@@ -277,6 +282,7 @@ public abstract class AbstractLinkedMap<
      * @param value  the value to store
      * @return the newly created entry
      */
+    @Override
     protected LinkEntry<K, V> createEntry(HashEntry<K, V> next, int hashCode, K key, V value) {
         return new LinkEntry<K, V>(next, hashCode, convertKey(key), value);
     }
@@ -291,6 +297,7 @@ public abstract class AbstractLinkedMap<
      * @param hashIndex  the index into the data structure
      * @param previous  the previous entry in the chain
      */
+    @Override
     protected void removeEntry(HashEntry<K, V> entry, int hashIndex, HashEntry<K, V> previous) {
         LinkEntry<K, V> link = (LinkEntry<K, V>) entry;
         link.before.after = link.after;
@@ -331,6 +338,7 @@ public abstract class AbstractLinkedMap<
     /**
      * {@inheritDoc}
      */
+    @Override
     public OrderedMapIterator<K, V> mapIterator() {
         if (size == 0) {
             return EmptyOrderedMapIterator.<K, V>getInstance();
@@ -388,6 +396,7 @@ public abstract class AbstractLinkedMap<
      * 
      * @return the entrySet iterator
      */
+    @Override
     protected Iterator<Map.Entry<K, V>> createEntrySetIterator() {
         if (size() == 0) {
             return EmptyOrderedIterator.<Map.Entry<K, V>>getInstance();
@@ -421,6 +430,7 @@ public abstract class AbstractLinkedMap<
      * 
      * @return the keySet iterator
      */
+    @Override
     protected Iterator<K> createKeySetIterator() {
         if (size() == 0) {
             return EmptyOrderedIterator.<K>getInstance();
@@ -455,6 +465,7 @@ public abstract class AbstractLinkedMap<
      * 
      * @return the values iterator
      */
+    @Override
     protected Iterator<V> createValuesIterator() {
         if (size() == 0) {
             return EmptyOrderedIterator.<V>getInstance();
@@ -585,6 +596,7 @@ public abstract class AbstractLinkedMap<
             next = parent.header.after;
         }
 
+        @Override
         public String toString() {
             if (last != null) {
                 return "Iterator[" + last.getKey() + "=" + last.getValue() + "]";

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java Wed Jul 21 17:39:49 2010
@@ -125,6 +125,7 @@ public abstract class AbstractMapDecorat
         return decorated().values();
     }
    
+    @Override
     public boolean equals(Object object) {
         if (object == this) {
             return true;
@@ -132,10 +133,12 @@ public abstract class AbstractMapDecorat
         return decorated().equals(object);
     }
 
+    @Override
     public int hashCode() {
         return decorated().hashCode();
     }
 
+    @Override
     public String toString() {
         return decorated().toString();
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java Wed Jul 21 17:39:49 2010
@@ -62,6 +62,7 @@ public abstract class AbstractOrderedMap
      * 
      * @return the decorated map
      */
+    @Override
     protected OrderedMap<K, V> decorated() {
         return (OrderedMap<K, V>) super.decorated();
     }
@@ -83,6 +84,7 @@ public abstract class AbstractOrderedMap
         return decorated().previousKey(key);
     }
 
+    @Override
     public OrderedMapIterator<K, V> mapIterator() {
         return decorated().mapIterator();
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java Wed Jul 21 17:39:49 2010
@@ -172,6 +172,7 @@ public abstract class AbstractReferenceM
     /**
      * Initialise this subclass during construction, cloning or deserialization.
      */
+    @Override
     protected void init() {
         queue = new ReferenceQueue<Object>();
     }
@@ -182,6 +183,7 @@ public abstract class AbstractReferenceM
      *
      * @return the size
      */
+    @Override
     public int size() {
         purgeBeforeRead();
         return super.size();
@@ -192,6 +194,7 @@ public abstract class AbstractReferenceM
      *
      * @return true if the map is currently size zero
      */
+    @Override
     public boolean isEmpty() {
         purgeBeforeRead();
         return super.isEmpty();
@@ -203,6 +206,7 @@ public abstract class AbstractReferenceM
      * @param key  the key to search for
      * @return true if the map contains the key
      */
+    @Override
     public boolean containsKey(Object key) {
         purgeBeforeRead();
         Entry<K, V> entry = getEntry(key);
@@ -218,6 +222,7 @@ public abstract class AbstractReferenceM
      * @param value  the value to search for
      * @return true if the map contains the value
      */
+    @Override
     public boolean containsValue(Object value) {
         purgeBeforeRead();
         if (value == null) {
@@ -232,6 +237,7 @@ public abstract class AbstractReferenceM
      * @param key  the key
      * @return the mapped value, null if no match
      */
+    @Override
     public V get(Object key) {
         purgeBeforeRead();
         Entry<K, V> entry = getEntry(key);
@@ -251,6 +257,7 @@ public abstract class AbstractReferenceM
      * @return the value previously mapped to this key, null if none
      * @throws NullPointerException if either the key or value is null
      */
+    @Override
     public V put(K key, V value) {
         if (key == null) {
             throw new NullPointerException("null keys not allowed");
@@ -269,6 +276,7 @@ public abstract class AbstractReferenceM
      * @param key  the mapping to remove
      * @return the value mapped to the removed key, null if key not in map
      */
+    @Override
     public V remove(Object key) {
         if (key == null) {
             return null;
@@ -280,6 +288,7 @@ public abstract class AbstractReferenceM
     /**
      * Clears this map.
      */
+    @Override
     public void clear() {
         super.clear();
         while (queue.poll() != null) {} // drain the queue
@@ -292,6 +301,7 @@ public abstract class AbstractReferenceM
      *
      * @return a map iterator
      */
+    @Override
     public MapIterator<K, V> mapIterator() {
         return new ReferenceMapIterator<K, V>(this);
     }
@@ -303,6 +313,7 @@ public abstract class AbstractReferenceM
      *
      * @return a set view of this map's entries
      */
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
         if (entrySet == null) {
             entrySet = new ReferenceEntrySet<K, V>(this);
@@ -315,6 +326,7 @@ public abstract class AbstractReferenceM
      *
      * @return a set view of this map's keys
      */
+    @Override
     public Set<K> keySet() {
         if (keySet == null) {
             keySet = new ReferenceKeySet<K>(this);
@@ -327,6 +339,7 @@ public abstract class AbstractReferenceM
      *
      * @return a set view of this map's values
      */
+    @Override
     public Collection<V> values() {
         if (values == null) {
             values = new ReferenceValues<V>(this);
@@ -405,6 +418,7 @@ public abstract class AbstractReferenceM
      * @param key  the key
      * @return the entry, null if no match
      */
+    @Override
     protected HashEntry<K, V> getEntry(Object key) {
         if (key == null) {
             return null;
@@ -435,6 +449,7 @@ public abstract class AbstractReferenceM
      * @param key2  the second key extracted from the entry via <code>entry.key</code>
      * @return true if equal
      */
+    @Override
     @SuppressWarnings("unchecked")
     protected boolean isEqualKey(Object key1, Object key2) {
         key2 = (keyType == ReferenceStrength.HARD ? key2 : ((Reference<K>) key2).get());
@@ -450,6 +465,7 @@ public abstract class AbstractReferenceM
      * @param value  the value to store
      * @return the newly created entry
      */
+    @Override
     protected ReferenceEntry<K, V> createEntry(HashEntry<K, V> next, int hashCode, K key, V value) {
         return new ReferenceEntry<K, V>(this, next, hashCode, key, value);
     }
@@ -459,6 +475,7 @@ public abstract class AbstractReferenceM
      *
      * @return the entrySet iterator
      */
+    @Override
     protected Iterator<Map.Entry<K, V>> createEntrySetIterator() {
         return new ReferenceEntrySetIterator<K, V>(this);
     }
@@ -468,6 +485,7 @@ public abstract class AbstractReferenceM
      *
      * @return the keySet iterator
      */
+    @Override
     protected Iterator<K> createKeySetIterator() {
         return new ReferenceKeySetIterator<K>(this);
     }
@@ -477,6 +495,7 @@ public abstract class AbstractReferenceM
      *
      * @return the values iterator
      */
+    @Override
     protected Iterator<V> createValuesIterator() {
         return new ReferenceValuesIterator<V>(this);
     }
@@ -491,10 +510,12 @@ public abstract class AbstractReferenceM
             super(parent);
         }
 
+        @Override
         public Object[] toArray() {
             return toArray(new Object[0]);
         }
 
+        @Override
         public <T> T[] toArray(T[] arr) {
             // special implementation to handle disappearing entries
             ArrayList<Map.Entry<K, V>> list = new ArrayList<Map.Entry<K, V>>();
@@ -515,10 +536,12 @@ public abstract class AbstractReferenceM
             super(parent);
         }
 
+        @Override
         public Object[] toArray() {
             return toArray(new Object[0]);
         }
 
+        @Override
         public <T> T[] toArray(T[] arr) {
             // special implementation to handle disappearing keys
             List<K> list = new ArrayList<K>(parent.size());
@@ -539,10 +562,12 @@ public abstract class AbstractReferenceM
             super(parent);
         }
 
+        @Override
         public Object[] toArray() {
             return toArray(new Object[0]);
         }
 
+        @Override
         public <T> T[] toArray(T[] arr) {
             // special implementation to handle disappearing values
             List<V> list = new ArrayList<V>(parent.size());
@@ -588,6 +613,7 @@ public abstract class AbstractReferenceM
          *
          * @return the key, which may be null if it was garbage collected
          */
+        @Override
         @SuppressWarnings("unchecked")
         public K getKey() {
             return (K) ((parent.keyType == ReferenceStrength.HARD) ? key : ((Reference<K>) key).get());
@@ -599,6 +625,7 @@ public abstract class AbstractReferenceM
          *
          * @return the value, which may be null if it was garbage collected
          */
+        @Override
         @SuppressWarnings("unchecked")
         public V getValue() {
             return (V) ((parent.valueType == ReferenceStrength.HARD) ? value : ((Reference<V>) value).get());
@@ -610,6 +637,7 @@ public abstract class AbstractReferenceM
          * @param obj  the object to store
          * @return the previous value
          */
+        @Override
         @SuppressWarnings("unchecked")
         public V setValue(V obj) {
             V old = getValue();
@@ -629,6 +657,7 @@ public abstract class AbstractReferenceM
          * @param obj  the other map entry to compare to
          * @return true if equal, false if not
          */
+        @Override
         @SuppressWarnings("unchecked")
         public boolean equals(Object obj) {
             if (obj == this) {
@@ -657,6 +686,7 @@ public abstract class AbstractReferenceM
          *
          * @return the hashcode of the entry
          */
+        @Override
         public int hashCode() {
             return parent.hashEntry(getKey(), getValue());
         }
@@ -912,6 +942,7 @@ public abstract class AbstractReferenceM
             this.hash = hash;
         }
 
+        @Override
         public int hashCode() {
             return hash;
         }
@@ -929,6 +960,7 @@ public abstract class AbstractReferenceM
             this.hash = hash;
         }
 
+        @Override
         public int hashCode() {
             return hash;
         }
@@ -953,6 +985,7 @@ public abstract class AbstractReferenceM
      *
      * @param out  the output stream
      */
+    @Override
     protected void doWriteObject(ObjectOutputStream out) throws IOException {
         out.writeInt(keyType.value);
         out.writeInt(valueType.value);
@@ -984,6 +1017,7 @@ public abstract class AbstractReferenceM
      *
      * @param in  the input stream
      */
+    @Override
     @SuppressWarnings("unchecked")
     protected void doReadObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
         this.keyType = ReferenceStrength.resolve(in.readInt());

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

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java Wed Jul 21 17:39:49 2010
@@ -116,6 +116,7 @@ public class CaseInsensitiveMap<K, V> ex
      * @param key  the key convert
      * @return the converted key
      */
+    @Override
     protected Object convertKey(Object key) {
         if (key != null) {
             char[] chars = key.toString().toCharArray();
@@ -133,6 +134,7 @@ public class CaseInsensitiveMap<K, V> ex
      *
      * @return a shallow clone
      */
+    @Override
     public CaseInsensitiveMap<K, V> clone() {
         return (CaseInsensitiveMap<K, V>) super.clone();
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/CompositeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/CompositeMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/CompositeMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/CompositeMap.java Wed Jul 21 17:39:49 2010
@@ -463,6 +463,7 @@ public class CompositeMap<K, V> extends 
      * @param obj  the object to compare to
      * @return true if the maps are equal
      */
+    @Override
     @SuppressWarnings("unchecked")
     public boolean equals(Object obj) {
         if (obj instanceof Map) {
@@ -475,6 +476,7 @@ public class CompositeMap<K, V> extends 
     /**
      * Gets a hash code for the Map as per the Map specification.
      */
+    @Override
     public int hashCode() {
         int code = 0;
         for (Map.Entry<K, V> entry : entrySet()) {

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/DefaultedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/DefaultedMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/DefaultedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/DefaultedMap.java Wed Jul 21 17:39:49 2010
@@ -183,6 +183,7 @@ public class DefaultedMap<K, V> extends 
     }
 
     //-----------------------------------------------------------------------
+    @Override
     @SuppressWarnings("unchecked")
     public V get(Object key) {
         // create value for key if key is not currently in the map

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeMap.java Wed Jul 21 17:39:49 2010
@@ -112,6 +112,7 @@ public class FixedSizeMap<K, V>
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public V put(K key, V value) {
         if (map.containsKey(key) == false) {
             throw new IllegalArgumentException("Cannot put new key/value pair - Map is fixed size");
@@ -119,6 +120,7 @@ public class FixedSizeMap<K, V>
         return map.put(key, value);
     }
 
+    @Override
     public void putAll(Map<? extends K, ? extends V> mapToCopy) {
         for (K key : mapToCopy.keySet()) {
             if (!containsKey(key)) {
@@ -128,25 +130,30 @@ public class FixedSizeMap<K, V>
         map.putAll(mapToCopy);
     }
 
+    @Override
     public void clear() {
         throw new UnsupportedOperationException("Map is fixed size");
     }
 
+    @Override
     public V remove(Object key) {
         throw new UnsupportedOperationException("Map is fixed size");
     }
 
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
         Set<Map.Entry<K, V>> set = map.entrySet();
         // unmodifiable set will still allow modification via Map.Entry objects
         return UnmodifiableSet.decorate(set);
     }
 
+    @Override
     public Set<K> keySet() {
         Set<K> set = map.keySet();
         return UnmodifiableSet.decorate(set);
     }
 
+    @Override
     public Collection<V> values() {
         Collection<V> coll = map.values();
         return UnmodifiableCollection.decorate(coll);

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java Wed Jul 21 17:39:49 2010
@@ -113,6 +113,7 @@ public class FixedSizeSortedMap<K, V>
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public V put(K key, V value) {
         if (map.containsKey(key) == false) {
             throw new IllegalArgumentException("Cannot put new key/value pair - Map is fixed size");
@@ -120,6 +121,7 @@ public class FixedSizeSortedMap<K, V>
         return map.put(key, value);
     }
 
+    @Override
     public void putAll(Map<? extends K, ? extends V> mapToCopy) {
         if (CollectionUtils.isSubCollection(mapToCopy.keySet(), keySet())) {
             throw new IllegalArgumentException("Cannot put new key/value pair - Map is fixed size");
@@ -127,35 +129,43 @@ public class FixedSizeSortedMap<K, V>
         map.putAll(mapToCopy);
     }
 
+    @Override
     public void clear() {
         throw new UnsupportedOperationException("Map is fixed size");
     }
 
+    @Override
     public V remove(Object key) {
         throw new UnsupportedOperationException("Map is fixed size");
     }
 
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
         return UnmodifiableSet.decorate(map.entrySet());
     }
 
+    @Override
     public Set<K> keySet() {
         return UnmodifiableSet.decorate(map.keySet());
     }
 
+    @Override
     public Collection<V> values() {
         return UnmodifiableCollection.decorate(map.values());
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public SortedMap<K, V> subMap(K fromKey, K toKey) {
         return new FixedSizeSortedMap<K, V>(getSortedMap().subMap(fromKey, toKey));
     }
 
+    @Override
     public SortedMap<K, V> headMap(K toKey) {
         return new FixedSizeSortedMap<K, V>(getSortedMap().headMap(toKey));
     }
 
+    @Override
     public SortedMap<K, V> tailMap(K fromKey) {
         return new FixedSizeSortedMap<K, V>(getSortedMap().tailMap(fromKey));
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/Flat3Map.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/Flat3Map.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/Flat3Map.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/Flat3Map.java Wed Jul 21 17:39:49 2010
@@ -667,6 +667,7 @@ public class Flat3Map<K, V> implements I
             canRemove = false;
         }
 
+        @Override
         public String toString() {
             if (canRemove) {
                 return "Iterator[" + getKey() + "=" + getValue() + "]";
@@ -702,14 +703,17 @@ public class Flat3Map<K, V> implements I
             this.parent = parent;
         }
 
+        @Override
         public int size() {
             return parent.size();
         }
 
+        @Override
         public void clear() {
             parent.clear();
         }
 
+        @Override
         public boolean remove(Object obj) {
             if (obj instanceof Map.Entry == false) {
                 return false;
@@ -721,6 +725,7 @@ public class Flat3Map<K, V> implements I
             return result;
         }
 
+        @Override
         public Iterator<Map.Entry<K, V>> iterator() {
             if (parent.delegateMap != null) {
                 return parent.delegateMap.entrySet().iterator();
@@ -829,6 +834,7 @@ public class Flat3Map<K, V> implements I
             return nextEntry();
         }
 
+        @Override
         public boolean equals(Object obj) {
             if (canRemove == false) {
                 return false;
@@ -843,6 +849,7 @@ public class Flat3Map<K, V> implements I
                    (value == null ? other.getValue() == null : value.equals(other.getValue()));
         }
 
+        @Override
         public int hashCode() {
             if (canRemove == false) {
                 return 0;
@@ -853,6 +860,7 @@ public class Flat3Map<K, V> implements I
                    (value == null ? 0 : value.hashCode());
         }
 
+        @Override
         public String toString() {
             if (canRemove) {
                 return getKey() + "=" + getValue();
@@ -886,24 +894,29 @@ public class Flat3Map<K, V> implements I
             this.parent = parent;
         }
 
+        @Override
         public int size() {
             return parent.size();
         }
 
+        @Override
         public void clear() {
             parent.clear();
         }
 
+        @Override
         public boolean contains(Object key) {
             return parent.containsKey(key);
         }
 
+        @Override
         public boolean remove(Object key) {
             boolean result = parent.containsKey(key);
             parent.remove(key);
             return result;
         }
 
+        @Override
         public Iterator<K> iterator() {
             if (parent.delegateMap != null) {
                 return parent.delegateMap.keySet().iterator();
@@ -956,18 +969,22 @@ public class Flat3Map<K, V> implements I
             this.parent = parent;
         }
 
+        @Override
         public int size() {
             return parent.size();
         }
 
+        @Override
         public void clear() {
             parent.clear();
         }
 
+        @Override
         public boolean contains(Object value) {
             return parent.containsValue(value);
         }
 
+        @Override
         public Iterator<V> iterator() {
             if (parent.delegateMap != null) {
                 return parent.delegateMap.values().iterator();
@@ -1030,6 +1047,7 @@ public class Flat3Map<K, V> implements I
      * @return a shallow clone
      * @since Commons Collections 3.1
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Flat3Map<K, V> clone() {
         try {
@@ -1049,6 +1067,7 @@ public class Flat3Map<K, V> implements I
      * @param obj  the object to compare to
      * @return true if equal
      */
+    @Override
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
@@ -1100,6 +1119,7 @@ public class Flat3Map<K, V> implements I
      *
      * @return the hash code defined in the Map interface
      */
+    @Override
     public int hashCode() {
         if (delegateMap != null) {
             return delegateMap.hashCode();
@@ -1121,6 +1141,7 @@ public class Flat3Map<K, V> implements I
      *
      * @return a string version of the map
      */
+    @Override
     public String toString() {
         if (delegateMap != null) {
             return delegateMap.toString();

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/HashedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/HashedMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/HashedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/HashedMap.java Wed Jul 21 17:39:49 2010
@@ -93,6 +93,7 @@ public class HashedMap<K, V>
      *
      * @return a shallow clone
      */
+    @Override
     public HashedMap<K, V> clone() {
         return (HashedMap<K, V>) super.clone();
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/IdentityMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/IdentityMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/IdentityMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/IdentityMap.java Wed Jul 21 17:39:49 2010
@@ -95,6 +95,7 @@ public class IdentityMap<K, V>
      * @param key  the key to get a hash code for
      * @return the hash code
      */
+    @Override
     protected int hash(Object key) {
         return System.identityHashCode(key);
     }
@@ -107,6 +108,7 @@ public class IdentityMap<K, V>
      * @param key2  the second key to compare
      * @return true if equal by identity
      */
+    @Override
     protected boolean isEqualKey(Object key1, Object key2) {
         return (key1 == key2);
     }
@@ -119,6 +121,7 @@ public class IdentityMap<K, V>
      * @param value2  the second value to compare
      * @return true if equal by identity
      */
+    @Override
     protected boolean isEqualValue(Object value1, Object value2) {
         return (value1 == value2);
     }
@@ -133,6 +136,7 @@ public class IdentityMap<K, V>
      * @param value  the value to store
      * @return the newly created entry
      */
+    @Override
     protected IdentityEntry<K, V> createEntry(HashEntry<K, V> next, int hashCode, K key, V value) {
         return new IdentityEntry<K, V>(next, hashCode, key, value);
     }
@@ -147,6 +151,7 @@ public class IdentityMap<K, V>
             super(next, hashCode, key, value);
         }
 
+        @Override
         public boolean equals(Object obj) {
             if (obj == this) {
                 return true;
@@ -160,6 +165,7 @@ public class IdentityMap<K, V>
                 (getValue() == other.getValue());
         }
 
+        @Override
         public int hashCode() {
             return System.identityHashCode(getKey()) ^
                    System.identityHashCode(getValue());
@@ -172,6 +178,7 @@ public class IdentityMap<K, V>
      *
      * @return a shallow clone
      */
+    @Override
     public IdentityMap<K, V> clone() {
         return (IdentityMap<K, V>) super.clone();
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/LRUMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/LRUMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/LRUMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/LRUMap.java Wed Jul 21 17:39:49 2010
@@ -170,6 +170,7 @@ public class LRUMap<K, V>
      * @param key  the key
      * @return the mapped value, null if no match
      */
+    @Override
     public V get(Object key) {
         LinkEntry<K, V> entry = getEntry(key);
         if (entry == null) {
@@ -218,6 +219,7 @@ public class LRUMap<K, V>
      * @param entry  the entry to update
      * @param newValue  the new value to store
      */
+    @Override
     protected void updateEntry(HashEntry<K, V> entry, V newValue) {
         moveToMRU((LinkEntry<K, V>) entry);  // handles modCount
         entry.setValue(newValue);
@@ -238,6 +240,7 @@ public class LRUMap<K, V>
      * @param key  the key to add
      * @param value  the value to add
      */
+    @Override
     protected void addMapping(int hashIndex, int hashCode, K key, V value) {
         if (isFull()) {
             LinkEntry<K, V> reuse = header.after;
@@ -397,6 +400,7 @@ public class LRUMap<K, V>
      *
      * @return a shallow clone
      */
+    @Override
     public LRUMap<K, V> clone() {
         return (LRUMap<K, V>) super.clone();
     }
@@ -420,6 +424,7 @@ public class LRUMap<K, V>
     /**
      * Writes the data necessary for <code>put()</code> to work in deserialization.
      */
+    @Override
     protected void doWriteObject(ObjectOutputStream out) throws IOException {
         out.writeInt(maxSize);
         super.doWriteObject(out);
@@ -428,6 +433,7 @@ public class LRUMap<K, V>
     /**
      * Reads the data necessary for <code>put()</code> to work in the superclass.
      */
+    @Override
     protected void doReadObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
         maxSize = in.readInt();
         super.doReadObject(in);

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/LinkedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/LinkedMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/LinkedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/LinkedMap.java Wed Jul 21 17:39:49 2010
@@ -113,6 +113,7 @@ public class LinkedMap<K, V> extends Abs
      *
      * @return a shallow clone
      */
+    @Override
     public LinkedMap<K, V> clone() {
         return (LinkedMap<K, V>) super.clone();
     }
@@ -215,70 +216,87 @@ public class LinkedMap<K, V> extends Abs
             this.parent = parent;
         }
 
+        @Override
         public int size() {
             return parent.size();
         }
 
+        @Override
         public K get(int index) {
             return parent.get(index);
         }
 
+        @Override
         public boolean contains(Object obj) {
             return parent.containsKey(obj);
         }
 
+        @Override
         public int indexOf(Object obj) {
             return parent.indexOf(obj);
         }
 
+        @Override
         public int lastIndexOf(Object obj) {
             return parent.indexOf(obj);
         }
 
+        @Override
         public boolean containsAll(Collection<?> coll) {
             return parent.keySet().containsAll(coll);
         }
 
+        @Override
         public K remove(int index) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public boolean remove(Object obj) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public boolean removeAll(Collection<?> coll) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public boolean retainAll(Collection<?> coll) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void clear() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public Object[] toArray() {
             return parent.keySet().toArray();
         }
 
+        @Override
         public <T> T[] toArray(T[] array) {
             return parent.keySet().toArray(array);
         }
 
+        @Override
         public Iterator<K> iterator() {
             return UnmodifiableIterator.decorate(parent.keySet().iterator());
         }
 
+        @Override
         public ListIterator<K> listIterator() {
             return UnmodifiableListIterator.decorate(super.listIterator());
         }
 
+        @Override
         public ListIterator<K> listIterator(int fromIndex) {
             return UnmodifiableListIterator.decorate(super.listIterator(fromIndex));
         }
 
+        @Override
         public List<K> subList(int fromIndexInclusive, int toIndexExclusive) {
             return UnmodifiableList.decorate(super.subList(fromIndexInclusive, toIndexExclusive));
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/ListOrderedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/ListOrderedMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/ListOrderedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/ListOrderedMap.java Wed Jul 21 17:39:49 2010
@@ -140,6 +140,7 @@ public class ListOrderedMap<K, V>
 
     // Implement OrderedMap
     //-----------------------------------------------------------------------
+    @Override
     public OrderedMapIterator<K, V> mapIterator() {
         return new ListOrderedMapIterator<K, V>(this);
     }
@@ -201,6 +202,7 @@ public class ListOrderedMap<K, V>
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public V put(K key, V value) {
         if (decorated().containsKey(key)) {
             // re-adding doesn't change order
@@ -213,6 +215,7 @@ public class ListOrderedMap<K, V>
         }
     }
 
+    @Override
     public void putAll(Map<? extends K, ? extends V> map) {
         for (Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
             put(entry.getKey(), entry.getValue());
@@ -233,12 +236,14 @@ public class ListOrderedMap<K, V>
         }
     }
 
+    @Override
     public V remove(Object key) {
         V result = decorated().remove(key);
         insertOrder.remove(key);
         return result;
     }
 
+    @Override
     public void clear() {
         decorated().clear();
         insertOrder.clear();
@@ -253,6 +258,7 @@ public class ListOrderedMap<K, V>
      * @see #keyList()
      * @return the fully modifiable collection view over the keys
      */
+    @Override
     public Set<K> keySet() {
         return new KeySetView<K>(this);
     }
@@ -282,6 +288,7 @@ public class ListOrderedMap<K, V>
      * @see #valueList()
      * @return the fully modifiable collection view over the values
      */
+    @Override
     public Collection<V> values() {
         return new ValuesView<V>(this);
     }
@@ -307,6 +314,7 @@ public class ListOrderedMap<K, V>
      *
      * @return the fully modifiable set view over the entries
      */
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
         return new EntrySetView<K, V>(this, this.insertOrder);
     }
@@ -317,6 +325,7 @@ public class ListOrderedMap<K, V>
      * 
      * @return the Map as a String
      */
+    @Override
     public String toString() {
         if (isEmpty()) {
             return "{}";
@@ -466,18 +475,22 @@ public class ListOrderedMap<K, V>
             this.parent = (ListOrderedMap<Object, V>) parent;
         }
 
+        @Override
         public int size() {
             return this.parent.size();
         }
 
+        @Override
         public boolean contains(Object value) {
             return this.parent.containsValue(value);
         }
 
+        @Override
         public void clear() {
             this.parent.clear();
         }
 
+        @Override
         public Iterator<V> iterator() {
             return new AbstractUntypedIteratorDecorator<Map.Entry<Object, V>, V>(parent.entrySet().iterator()) {
                 public V next() {
@@ -486,14 +499,17 @@ public class ListOrderedMap<K, V>
             };
         }
 
+        @Override
         public V get(int index) {
             return this.parent.getValue(index);
         }
 
+        @Override
         public V set(int index, V value) {
             return this.parent.setValue(index, value);
         }
 
+        @Override
         public V remove(int index) {
             return this.parent.remove(index);
         }
@@ -509,18 +525,22 @@ public class ListOrderedMap<K, V>
             this.parent = (ListOrderedMap<K, Object>) parent;
         }
 
+        @Override
         public int size() {
             return this.parent.size();
         }
 
+        @Override
         public boolean contains(Object value) {
             return this.parent.containsKey(value);
         }
 
+        @Override
         public void clear() {
             this.parent.clear();
         }
 
+        @Override
         public Iterator<K> iterator() {
             return new AbstractUntypedIteratorDecorator<Map.Entry<K, Object>, K>(parent.entrySet().iterator()) {
                 public K next() {
@@ -549,21 +569,26 @@ public class ListOrderedMap<K, V>
             return entrySet;
         }
         
+        @Override
         public int size() {
             return this.parent.size();
         }
+        @Override
         public boolean isEmpty() {
             return this.parent.isEmpty();
         }
 
+        @Override
         public boolean contains(Object obj) {
             return getEntrySet().contains(obj);
         }
 
+        @Override
         public boolean containsAll(Collection<?> coll) {
             return getEntrySet().containsAll(coll);
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public boolean remove(Object obj) {
             if (obj instanceof Map.Entry == false) {
@@ -577,10 +602,12 @@ public class ListOrderedMap<K, V>
             return false;
         }
 
+        @Override
         public void clear() {
             this.parent.clear();
         }
 
+        @Override
         public boolean equals(Object obj) {
             if (obj == this) {
                 return true;
@@ -588,14 +615,17 @@ public class ListOrderedMap<K, V>
             return getEntrySet().equals(obj);
         }
 
+        @Override
         public int hashCode() {
             return getEntrySet().hashCode();
         }
 
+        @Override
         public String toString() {
             return getEntrySet().toString();
         }
 
+        @Override
         public Iterator<Map.Entry<K, V>> iterator() {
             return new ListOrderedIterator<K, V>(parent, insertOrder);
         }
@@ -616,6 +646,7 @@ public class ListOrderedMap<K, V>
             return new ListOrderedMapEntry<K, V>(parent, last);
         }
 
+        @Override
         public void remove() {
             super.remove();
             parent.decorated().remove(last);
@@ -631,10 +662,12 @@ public class ListOrderedMap<K, V>
             this.parent = parent;
         }
 
+        @Override
         public V getValue() {
             return parent.get(key);
         }
 
+        @Override
         public V setValue(V value) {
             return parent.decorated().put(key, value);
         }
@@ -709,6 +742,7 @@ public class ListOrderedMap<K, V>
             readable = false;
         }
 
+        @Override
         public String toString() {
             if (readable == true) {
                 return "Iterator[" + getKey() + "=" + getValue() + "]";

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/MultiKeyMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/MultiKeyMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/MultiKeyMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/MultiKeyMap.java Wed Jul 21 17:39:49 2010
@@ -807,6 +807,7 @@ public class MultiKeyMap<K, V> extends A
      *
      * @return a shallow clone
      */
+    @Override
     public MultiKeyMap<K, V> clone() {
         return new MultiKeyMap<K, V>(decorated().clone());
     }
@@ -821,6 +822,7 @@ public class MultiKeyMap<K, V> extends A
      * @throws NullPointerException if the key is null
      * @throws ClassCastException if the key is not a MultiKey
      */
+    @Override
     public V put(MultiKey<? extends K> key, V value) {
         checkKey(key);
         return super.put(key, value);
@@ -843,6 +845,7 @@ public class MultiKeyMap<K, V> extends A
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public MapIterator<MultiKey<? extends K>, V> mapIterator() {
         return decorated().mapIterator();
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/MultiValueMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/MultiValueMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/MultiValueMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/MultiValueMap.java Wed Jul 21 17:39:49 2010
@@ -166,6 +166,7 @@ public class MultiValueMap<K, V> extends
     /**
      * Clear the map.
      */
+    @Override
     public void clear() {
         // If you believe that you have GC issues here, try uncommenting this code
 //        Set pairs = getMap().entrySet();
@@ -215,6 +216,7 @@ public class MultiValueMap<K, V> extends
      * @param value  the value to search for
      * @return true if the map contains the value
      */
+    @Override
     @SuppressWarnings("unchecked")
     public boolean containsValue(Object value) {
         Set<Map.Entry<K, Object>> pairs = decorated().entrySet();
@@ -238,6 +240,7 @@ public class MultiValueMap<K, V> extends
      * @param value  the value to add to the collection at the key
      * @return the value added if the map changed and null if the map did not change
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Object put(K key, Object value) {
         boolean result = false;
@@ -267,6 +270,7 @@ public class MultiValueMap<K, V> extends
      *
      * @param map  the map to copy (either a normal or multi map)
      */
+    @Override
     @SuppressWarnings("unchecked")
     public void putAll(Map<? extends K, ?> map) {
         if (map instanceof MultiMap) {
@@ -287,6 +291,7 @@ public class MultiValueMap<K, V> extends
      *
      * @return a collection view of the values contained in this map
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Collection<Object> values() {
         Collection<V> vs = valuesView;
@@ -406,6 +411,7 @@ public class MultiValueMap<K, V> extends
      * Inner class that provides the values view.
      */
     private class Values extends AbstractCollection<V> {
+        @Override
         public Iterator<V> iterator() {
             final IteratorChain<V> chain = new IteratorChain<V>();
             for (Iterator<K> it = keySet().iterator(); it.hasNext();) {
@@ -414,10 +420,12 @@ public class MultiValueMap<K, V> extends
             return chain;
         }
 
+        @Override
         public int size() {
             return totalSize();
         }
 
+        @Override
         public void clear() {
             MultiValueMap.this.clear();
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/PredicatedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/PredicatedMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/PredicatedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/PredicatedMap.java Wed Jul 21 17:39:49 2010
@@ -151,6 +151,7 @@ public class PredicatedMap<K, V>
      * @throws IllegalArgumentException if invalid
      * @since Commons Collections 3.1
      */
+    @Override
     protected V checkSetValue(V value) {
         if (valuePredicate.evaluate(value) == false) {
             throw new IllegalArgumentException("Cannot set value - Predicate rejected it");
@@ -164,16 +165,19 @@ public class PredicatedMap<K, V>
      * @return true if a value predicate is in use
      * @since Commons Collections 3.1
      */
+    @Override
     protected boolean isSetValueChecking() {
         return (valuePredicate != null);
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public V put(K key, V value) {
         validate(key, value);
         return map.put(key, value);
     }
 
+    @Override
     public void putAll(Map<? extends K, ? extends V> mapToCopy) {
         for (Map.Entry<? extends K, ? extends V> entry : mapToCopy.entrySet()) {
             validate(entry.getKey(), entry.getValue());

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java Wed Jul 21 17:39:49 2010
@@ -156,6 +156,7 @@ public class ReferenceIdentityMap<K, V> 
      * @param key  the key to get a hash code for
      * @return the hash code
      */
+    @Override
     protected int hash(Object key) {
         return System.identityHashCode(key);
     }
@@ -169,6 +170,7 @@ public class ReferenceIdentityMap<K, V> 
      * @param value  the value to get a hash code for, may be null
      * @return the hash code, as per the MapEntry specification
      */
+    @Override
     protected int hashEntry(Object key, Object value) {
         return System.identityHashCode(key) ^
                System.identityHashCode(value);
@@ -184,6 +186,7 @@ public class ReferenceIdentityMap<K, V> 
      * @param key2  the second key extracted from the entry via <code>entry.key</code>
      * @return true if equal by identity
      */
+    @Override
     protected boolean isEqualKey(Object key1, Object key2) {
         key2 = keyType == ReferenceStrength.HARD ? key2 : ((Reference<?>) key2).get();
         return key1 == key2;
@@ -198,6 +201,7 @@ public class ReferenceIdentityMap<K, V> 
      * @param value2  the second value extracted from the entry via <code>getValue()</code>
      * @return true if equal by identity
      */
+    @Override
     protected boolean isEqualValue(Object value1, Object value2) {
         return value1 == value2;
     }



Mime
View raw message