You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2010/07/21 19:03:59 UTC
svn commit: r966315 - in
/commons/proper/collections/trunk/src/java/org/apache/commons/collections:
bidimap/ list/
Author: sebb
Date: Wed Jul 21 17:03:58 2010
New Revision: 966315
URL: http://svn.apache.org/viewvc?rev=966315&view=rev
Log:
Add missing @Override markers
Modified:
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/CursorableLinkedList.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/FixedSizeList.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/PredicatedList.java
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java?rev=966315&r1=966314&r2=966315&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java Wed Jul 21 17:03:58 2010
@@ -148,14 +148,17 @@ public abstract class AbstractDualBidiMa
return normalMap.containsKey(key);
}
+ @Override
public boolean equals(Object obj) {
return normalMap.equals(obj);
}
+ @Override
public int hashCode() {
return normalMap.hashCode();
}
+ @Override
public String toString() {
return normalMap.toString();
}
@@ -337,6 +340,7 @@ public abstract class AbstractDualBidiMa
this.parent = parent;
}
+ @Override
public boolean removeAll(Collection<?> coll) {
if (parent.isEmpty() || coll.isEmpty()) {
return false;
@@ -352,6 +356,7 @@ public abstract class AbstractDualBidiMa
return modified;
}
+ @Override
public boolean retainAll(Collection<?> coll) {
if (parent.isEmpty()) {
return false;
@@ -371,6 +376,7 @@ public abstract class AbstractDualBidiMa
return modified;
}
+ @Override
public void clear() {
parent.clear();
}
@@ -395,14 +401,17 @@ public abstract class AbstractDualBidiMa
super(parent.normalMap.keySet(), (AbstractDualBidiMap<K, Object>) parent);
}
+ @Override
public Iterator<K> iterator() {
return parent.createKeySetIterator(super.iterator());
}
+ @Override
public boolean contains(Object key) {
return parent.normalMap.containsKey(key);
}
+ @Override
public boolean remove(Object key) {
if (parent.normalMap.containsKey(key)) {
Object value = parent.normalMap.remove(key);
@@ -437,12 +446,14 @@ public abstract class AbstractDualBidiMa
this.parent = parent;
}
+ @Override
public K next() {
lastKey = super.next();
canRemove = true;
return lastKey;
}
+ @Override
public void remove() {
if (canRemove == false) {
throw new IllegalStateException("Iterator remove() can only be called once after next()");
@@ -474,14 +485,17 @@ public abstract class AbstractDualBidiMa
super(parent.normalMap.values(), (AbstractDualBidiMap<Object, V>) parent);
}
+ @Override
public Iterator<V> iterator() {
return parent.createValuesIterator(super.iterator());
}
+ @Override
public boolean contains(Object value) {
return parent.reverseMap.containsKey(value);
}
+ @Override
public boolean remove(Object value) {
if (parent.reverseMap.containsKey(value)) {
Object key = parent.reverseMap.remove(value);
@@ -517,12 +531,14 @@ public abstract class AbstractDualBidiMa
this.parent = (AbstractDualBidiMap<Object, V>) parent;
}
+ @Override
public V next() {
lastValue = super.next();
canRemove = true;
return lastValue;
}
+ @Override
public void remove() {
if (canRemove == false) {
throw new IllegalStateException("Iterator remove() can only be called once after next()");
@@ -552,10 +568,12 @@ public abstract class AbstractDualBidiMa
super(parent.normalMap.entrySet(), parent);
}
+ @Override
public Iterator<Map.Entry<K, V>> iterator() {
return parent.createEntrySetIterator(super.iterator());
}
+ @Override
public boolean remove(Object obj) {
if (obj instanceof Map.Entry == false) {
return false;
@@ -598,12 +616,14 @@ public abstract class AbstractDualBidiMa
this.parent = parent;
}
+ @Override
public Map.Entry<K, V> next() {
last = new MapEntry<K, V>(super.next(), parent);
canRemove = true;
return last;
}
+ @Override
public void remove() {
if (canRemove == false) {
throw new IllegalStateException("Iterator remove() can only be called once after next()");
@@ -635,6 +655,7 @@ public abstract class AbstractDualBidiMa
this.parent = parent;
}
+ @Override
public V setValue(V value) {
K key = MapEntry.this.getKey();
if (parent.reverseMap.containsKey(value) &&
@@ -727,6 +748,7 @@ public abstract class AbstractDualBidiMa
canRemove = false;
}
+ @Override
public String toString() {
if (last != null) {
return "MapIterator[" + getKey() + "=" + getValue() + "]";
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java?rev=966315&r1=966314&r2=966315&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java Wed Jul 21 17:03:58 2010
@@ -55,11 +55,13 @@ public abstract class AbstractOrderedBid
*
* @return the decorated map
*/
+ @Override
protected OrderedBidiMap<K, V> decorated() {
return (OrderedBidiMap<K, V>) super.decorated();
}
//-----------------------------------------------------------------------
+ @Override
public OrderedMapIterator<K, V> mapIterator() {
return decorated().mapIterator();
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java?rev=966315&r1=966314&r2=966315&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java Wed Jul 21 17:03:58 2010
@@ -84,6 +84,7 @@ public class DualHashBidiMap<K, V> exten
* @param inverseBidiMap the inverse BidiMap
* @return new bidi map
*/
+ @Override
protected BidiMap<V, K> createBidiMap(Map<V, K> normalMap, Map<K, V> reverseMap, BidiMap<K, V> inverseBidiMap) {
return new DualHashBidiMap<V, K>(normalMap, reverseMap, inverseBidiMap);
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/CursorableLinkedList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/CursorableLinkedList.java?rev=966315&r1=966314&r2=966315&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/CursorableLinkedList.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/CursorableLinkedList.java Wed Jul 21 17:03:58 2010
@@ -90,6 +90,7 @@ public class CursorableLinkedList<E> ext
* The equivalent of a default constructor called
* by any constructor and by <code>readObject</code>.
*/
+ @Override
protected void init() {
super.init();
cursors = new ArrayList<WeakReference<Cursor<E>>>();
@@ -105,6 +106,7 @@ public class CursorableLinkedList<E> ext
*
* @return a new iterator that does <b>not</b> support concurrent modification
*/
+ @Override
public Iterator<E> iterator() {
return super.listIterator(0);
}
@@ -124,6 +126,7 @@ public class CursorableLinkedList<E> ext
*
* @return a new cursor iterator
*/
+ @Override
public ListIterator<E> listIterator() {
return cursor(0);
}
@@ -144,6 +147,7 @@ public class CursorableLinkedList<E> ext
* @param fromIndex the index to start from
* @return a new cursor iterator
*/
+ @Override
public ListIterator<E> listIterator(int fromIndex) {
return cursor(fromIndex);
}
@@ -217,6 +221,7 @@ public class CursorableLinkedList<E> ext
* @param node node to update
* @param value new value of the node
*/
+ @Override
protected void updateNode(Node<E> node, E value) {
super.updateNode(node, value);
broadcastNodeChanged(node);
@@ -229,6 +234,7 @@ public class CursorableLinkedList<E> ext
* @param insertBeforeNode node to insert before
* @throws NullPointerException if either node is null
*/
+ @Override
protected void addNode(Node<E> nodeToInsert, Node<E> insertBeforeNode) {
super.addNode(nodeToInsert, insertBeforeNode);
broadcastNodeInserted(nodeToInsert);
@@ -240,6 +246,7 @@ public class CursorableLinkedList<E> ext
* @param node the node to remove
* @throws NullPointerException if <code>node</code> is null
*/
+ @Override
protected void removeNode(Node<E> node) {
super.removeNode(node);
broadcastNodeRemoved(node);
@@ -248,6 +255,7 @@ public class CursorableLinkedList<E> ext
/**
* Removes all nodes by iteration.
*/
+ @Override
protected void removeAllNodes() {
if (size() > 0) {
// superclass implementation would break all the iterators
@@ -381,6 +389,7 @@ public class CursorableLinkedList<E> ext
* @param subList the sublist to get an iterator for
* @param fromIndex the index to start from, relative to the sublist
*/
+ @Override
protected ListIterator<E> createSubListListIterator(LinkedSubList<E> subList, int fromIndex) {
SubCursor<E> cursor = new SubCursor<E>(subList, fromIndex);
registerCursor(cursor);
@@ -421,6 +430,7 @@ public class CursorableLinkedList<E> ext
*
* @throws IllegalStateException if there is no item to remove
*/
+ @Override
public void remove() {
// overridden, as the nodeRemoved() method updates the iterator
// state in the parent.removeNode() call below
@@ -442,6 +452,7 @@ public class CursorableLinkedList<E> ext
*
* @param obj the object to add
*/
+ @Override
public void add(E obj) {
// overridden, as the nodeInserted() method updates the iterator state
super.add(obj);
@@ -460,6 +471,7 @@ public class CursorableLinkedList<E> ext
*
* @return the next index
*/
+ @Override
public int nextIndex() {
if (nextIndexValid == false) {
if (next == parent.header) {
@@ -533,6 +545,7 @@ public class CursorableLinkedList<E> ext
/**
* Override superclass modCount check, and replace it with our valid flag.
*/
+ @Override
protected void checkModCount() {
if (!valid) {
throw new ConcurrentModificationException("Cursor closed");
@@ -576,24 +589,29 @@ public class CursorableLinkedList<E> ext
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;
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/FixedSizeList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/FixedSizeList.java?rev=966315&r1=966314&r2=966315&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/FixedSizeList.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/FixedSizeList.java Wed Jul 21 17:03:58 2010
@@ -68,70 +68,87 @@ public class FixedSizeList<E>
}
//-----------------------------------------------------------------------
+ @Override
public boolean add(E object) {
throw new UnsupportedOperationException("List is fixed size");
}
+ @Override
public void add(int index, E object) {
throw new UnsupportedOperationException("List is fixed size");
}
+ @Override
public boolean addAll(Collection<? extends E> coll) {
throw new UnsupportedOperationException("List is fixed size");
}
+ @Override
public boolean addAll(int index, Collection<? extends E> coll) {
throw new UnsupportedOperationException("List is fixed size");
}
+ @Override
public void clear() {
throw new UnsupportedOperationException("List is fixed size");
}
+ @Override
public E get(int index) {
return decorated().get(index);
}
+ @Override
public int indexOf(Object object) {
return decorated().indexOf(object);
}
+ @Override
public Iterator<E> iterator() {
return UnmodifiableIterator.decorate(decorated().iterator());
}
+ @Override
public int lastIndexOf(Object object) {
return decorated().lastIndexOf(object);
}
+ @Override
public ListIterator<E> listIterator() {
return new FixedSizeListIterator(decorated().listIterator(0));
}
+ @Override
public ListIterator<E> listIterator(int index) {
return new FixedSizeListIterator(decorated().listIterator(index));
}
+ @Override
public E remove(int index) {
throw new UnsupportedOperationException("List is fixed size");
}
+ @Override
public boolean remove(Object object) {
throw new UnsupportedOperationException("List is fixed size");
}
+ @Override
public boolean removeAll(Collection<?> coll) {
throw new UnsupportedOperationException("List is fixed size");
}
+ @Override
public boolean retainAll(Collection<?> coll) {
throw new UnsupportedOperationException("List is fixed size");
}
+ @Override
public E set(int index, E object) {
return decorated().set(index, object);
}
+ @Override
public List<E> subList(int fromIndex, int toIndex) {
List<E> sub = decorated().subList(fromIndex, toIndex);
return new FixedSizeList<E>(sub);
@@ -144,9 +161,11 @@ public class FixedSizeList<E>
protected FixedSizeListIterator(ListIterator<E> iterator) {
super(iterator);
}
+ @Override
public void remove() {
throw new UnsupportedOperationException("List is fixed size");
}
+ @Override
public void add(Object object) {
throw new UnsupportedOperationException("List is fixed size");
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/PredicatedList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/PredicatedList.java?rev=966315&r1=966314&r2=966315&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/PredicatedList.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/PredicatedList.java Wed Jul 21 17:03:58 2010
@@ -85,6 +85,7 @@ public class PredicatedList<E> extends P
*
* @return the decorated list
*/
+ @Override
protected List<E> decorated() {
return (List<E>) super.decorated();
}
@@ -146,11 +147,13 @@ public class PredicatedList<E> extends P
super(iterator);
}
+ @Override
public void add(E object) {
validate(object);
iterator.add(object);
}
+ @Override
public void set(E object) {
validate(object);
iterator.set(object);