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:39:55 UTC
svn commit: r966327 [1/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...
Author: sebb
Date: Wed Jul 21 17:39:49 2010
New Revision: 966327
URL: http://svn.apache.org/viewvc?rev=966327&view=rev
Log:
Add missing @Override markers
Modified:
commons/proper/collections/trunk/src/java/org/apache/commons/collections/ExtendedProperties.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/AbstractMapBag.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/PredicatedBag.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TreeBag.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/PredicatedCollection.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/TransformedCollection.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/BooleanComparator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ComparableComparator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ComparatorChain.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/NullComparator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ReverseComparator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/MultiKey.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/AbstractLinkedList.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/AbstractListDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/GrowthList.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/LazyList.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/SetUniqueList.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/TransformedList.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/TreeList.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/list/UnmodifiableList.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/CompositeMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/DefaultedMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/Flat3Map.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/HashedMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/IdentityMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/LRUMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/LinkedMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/ListOrderedMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/MultiKeyMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/MultiValueMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/PredicatedMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/SingletonMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/TransformedMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/CompositeSet.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/ListOrderedSet.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/MapBackedSet.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/PredicatedSet.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSet.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/BulkTest.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/LocalTestNode.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestArrayStack.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestClosureUtils.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestFactoryUtils.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestLinkedList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestListUtils.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestMapUtils.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTransformerUtils.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTreeMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/AbstractTestBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestHashBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTreeBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestNullComparator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestAnyAllOnePredicate.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/AbstractTestListIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper2.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/AbstractTestList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestPredicatedList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSetUniqueList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSynchronizedList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestTransformedList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestTreeList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestIdentityMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLRUMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLinkedMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestReferenceMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestSingletonMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/ExtendedProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/ExtendedProperties.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/ExtendedProperties.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/ExtendedProperties.java Wed Jul 21 17:39:49 2010
@@ -413,6 +413,7 @@ public class ExtendedProperties extends
*
* @return True if the object has more tokens.
*/
+ @Override
public boolean hasMoreTokens() {
return super.hasMoreTokens();
}
@@ -422,6 +423,7 @@ public class ExtendedProperties extends
*
* @return A String.
*/
+ @Override
public String nextToken() {
StringBuilder buffer = new StringBuilder();
@@ -1708,6 +1710,7 @@ public class ExtendedProperties extends
* @param value for the property
* @return old value of the property
*/
+ @Override
public Object put(Object key, Object value) {
String strKey = String.valueOf(key);
Object ret = getProperty(strKey);
@@ -1722,6 +1725,7 @@ public class ExtendedProperties extends
*
* @param map full of key/value pair data
*/
+ @Override
public void putAll(Map map) {
if (map instanceof ExtendedProperties) {
for (Iterator it = ((ExtendedProperties) map).getKeys(); it.hasNext(); ) {
@@ -1744,6 +1748,7 @@ public class ExtendedProperties extends
* @param key specifying the property
* @return old value of the property
*/
+ @Override
public Object remove(Object key) {
String strKey = String.valueOf(key);
Object ret = getProperty(strKey);
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java Wed Jul 21 17:39:49 2010
@@ -60,6 +60,7 @@ public abstract class AbstractBagDecorat
*
* @return the decorated bag
*/
+ @Override
protected Bag<E> decorated() {
return (Bag<E>) super.decorated();
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/AbstractMapBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/AbstractMapBag.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/AbstractMapBag.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/AbstractMapBag.java Wed Jul 21 17:39:49 2010
@@ -417,6 +417,7 @@ public abstract class AbstractMapBag<E>
this.value = value;
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof MutableInteger == false) {
return false;
@@ -424,6 +425,7 @@ public abstract class AbstractMapBag<E>
return ((MutableInteger) obj).value == value;
}
+ @Override
public int hashCode() {
return value;
}
@@ -530,6 +532,7 @@ public abstract class AbstractMapBag<E>
* @param object the Bag to compare to
* @return true if equal
*/
+ @Override
public boolean equals(Object object) {
if (object == this) {
return true;
@@ -559,6 +562,7 @@ public abstract class AbstractMapBag<E>
*
* @return the hash code of the Bag
*/
+ @Override
public int hashCode() {
int total = 0;
for (Iterator<Map.Entry<E, MutableInteger>> it = map.entrySet().iterator(); it.hasNext();) {
@@ -575,6 +579,7 @@ public abstract class AbstractMapBag<E>
*
* @return a debugging toString
*/
+ @Override
public String toString() {
if (size() == 0) {
return "[]";
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java Wed Jul 21 17:39:49 2010
@@ -59,6 +59,7 @@ public abstract class AbstractSortedBagD
*
* @return the decorated bag
*/
+ @Override
protected SortedBag<E> decorated() {
return (SortedBag<E>) super.decorated();
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/PredicatedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/PredicatedBag.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/PredicatedBag.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/PredicatedBag.java Wed Jul 21 17:39:49 2010
@@ -84,6 +84,7 @@ public class PredicatedBag<E>
*
* @return the decorated bag
*/
+ @Override
protected Bag<E> decorated() {
return (Bag<E>) super.decorated();
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java Wed Jul 21 17:39:49 2010
@@ -83,6 +83,7 @@ public class PredicatedSortedBag<E>
*
* @return the decorated bag
*/
+ @Override
protected SortedBag<E> decorated() {
return (SortedBag<E>) super.decorated();
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TreeBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TreeBag.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TreeBag.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TreeBag.java Wed Jul 21 17:39:49 2010
@@ -81,6 +81,7 @@ public class TreeBag<E> extends Abstract
//-----------------------------------------------------------------------
// TODO: Generics - should this be E<? extends Comparable> or some such?
+ @Override
public boolean add(E object) {
if(comparator() == null && !(object instanceof Comparable)) {
throw new IllegalArgumentException("Objects of type " + object.getClass() + " cannot be added to " +
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java Wed Jul 21 17:39:49 2010
@@ -100,43 +100,53 @@ public final class UnmodifiableBag<E>
}
//-----------------------------------------------------------------------
+ @Override
public Iterator<E> iterator() {
return UnmodifiableIterator.<E>decorate(decorated().iterator());
}
+ @Override
public boolean add(E object) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean addAll(Collection<? extends E> coll) {
throw new UnsupportedOperationException();
}
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean remove(Object object) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean removeAll(Collection<?> coll) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean retainAll(Collection<?> coll) {
throw new UnsupportedOperationException();
}
//-----------------------------------------------------------------------
+ @Override
public boolean add(E object, int count) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean remove(Object object, int count) {
throw new UnsupportedOperationException();
}
+ @Override
public Set<E> uniqueSet() {
Set<E> set = decorated().uniqueSet();
return UnmodifiableSet.<E>decorate(set);
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java Wed Jul 21 17:39:49 2010
@@ -100,43 +100,53 @@ public final class UnmodifiableSortedBag
}
//-----------------------------------------------------------------------
+ @Override
public Iterator<E> iterator() {
return UnmodifiableIterator.decorate(decorated().iterator());
}
+ @Override
public boolean add(E object) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean addAll(Collection<? extends E> coll) {
throw new UnsupportedOperationException();
}
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean remove(Object object) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean removeAll(Collection<?> coll) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean retainAll(Collection<?> coll) {
throw new UnsupportedOperationException();
}
//-----------------------------------------------------------------------
+ @Override
public boolean add(E object, int count) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean remove(Object object, int count) {
throw new UnsupportedOperationException();
}
+ @Override
public Set<E> uniqueSet() {
Set<E> set = decorated().uniqueSet();
return UnmodifiableSet.decorate(set);
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java Wed Jul 21 17:39:49 2010
@@ -55,11 +55,13 @@ public abstract class AbstractBidiMapDec
*
* @return the decorated map
*/
+ @Override
protected BidiMap<K, V> decorated() {
return (BidiMap<K, V>) super.decorated();
}
//-----------------------------------------------------------------------
+ @Override
public MapIterator<K, V> mapIterator() {
return decorated().mapIterator();
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java Wed Jul 21 17:39:49 2010
@@ -56,6 +56,7 @@ public abstract class AbstractSortedBidi
*
* @return the decorated map
*/
+ @Override
protected SortedBidiMap<K, V> decorated() {
return (SortedBidiMap<K, V>) super.decorated();
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java Wed Jul 21 17:39:49 2010
@@ -121,6 +121,7 @@ public class DualTreeBidiMap<K, V> exten
* @param inverseMap the inverse BidiMap
* @return new bidi map
*/
+ @Override
protected DualTreeBidiMap<V, K> createBidiMap(Map<V, K> normalMap, Map<K, V> reverseMap, BidiMap<K, V> inverseMap) {
return new DualTreeBidiMap<V, K>(normalMap, reverseMap, inverseMap);
}
@@ -183,6 +184,7 @@ public class DualTreeBidiMap<K, V> exten
*
* @return a new ordered map iterator
*/
+ @Override
public OrderedMapIterator<K, V> mapIterator() {
return new BidiOrderedMapIterator<K, V>(this);
}
@@ -240,11 +242,13 @@ public class DualTreeBidiMap<K, V> exten
this.bidi = (DualTreeBidiMap<K, V>) decorated();
}
+ @Override
public boolean containsValue(Object value) {
// override as default implementation uses reverseMap
return decorated().normalMap.containsValue(value);
}
+ @Override
public void clear() {
// override as default implementation uses reverseMap
for (Iterator<K> it = keySet().iterator(); it.hasNext();) {
@@ -253,14 +257,17 @@ public class DualTreeBidiMap<K, V> exten
}
}
+ @Override
public SortedMap<K, V> headMap(K toKey) {
return new ViewMap<K, V>(decorated(), super.headMap(toKey));
}
+ @Override
public SortedMap<K, V> tailMap(K fromKey) {
return new ViewMap<K, V>(decorated(), super.tailMap(fromKey));
}
+ @Override
public SortedMap<K, V> subMap(K fromKey, K toKey) {
return new ViewMap<K, V>(decorated(), super.subMap(fromKey, toKey));
}
@@ -270,10 +277,12 @@ public class DualTreeBidiMap<K, V> exten
return (DualTreeBidiMap<K, V>) super.decorated();
}
+ @Override
public K previousKey(K key) {
return decorated().previousKey(key);
};
+ @Override
public K nextKey(K key) {
return decorated().nextKey(key);
};
@@ -358,6 +367,7 @@ public class DualTreeBidiMap<K, V> exten
last = null;
}
+ @Override
public String toString() {
if (last != null) {
return "MapIterator[" + getKey() + "=" + getValue() + "]";
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java Wed Jul 21 17:39:49 2010
@@ -447,6 +447,7 @@ public class TreeBidiMap<K extends Compa
* @param obj the object to compare to
* @return true if equal
*/
+ @Override
public boolean equals(Object obj) {
return this.doEquals(obj, KEY);
}
@@ -456,6 +457,7 @@ public class TreeBidiMap<K extends Compa
*
* @return the hash code value for this map
*/
+ @Override
public int hashCode() {
return this.doHashCode(KEY);
}
@@ -465,6 +467,7 @@ public class TreeBidiMap<K extends Compa
*
* @return a standard format string version of the map
*/
+ @Override
public String toString() {
return this.doToString(KEY);
}
@@ -1423,10 +1426,12 @@ public class TreeBidiMap<K extends Compa
this.orderType = orderType;
}
+ @Override
public int size() {
return TreeBidiMap.this.size();
}
+ @Override
public void clear() {
TreeBidiMap.this.clear();
}
@@ -1495,6 +1500,7 @@ public class TreeBidiMap<K extends Compa
super(KEY);
}
+ @Override
public boolean contains(Object obj) {
if (obj instanceof Map.Entry == false) {
return false;
@@ -1505,6 +1511,7 @@ public class TreeBidiMap<K extends Compa
return node != null && node.getValue().equals(value);
}
+ @Override
public boolean remove(Object obj) {
if (obj instanceof Map.Entry == false) {
return false;
@@ -1534,6 +1541,7 @@ public class TreeBidiMap<K extends Compa
super(VALUE);
}
+ @Override
public boolean contains(Object obj) {
if (obj instanceof Map.Entry == false) {
return false;
@@ -1544,6 +1552,7 @@ public class TreeBidiMap<K extends Compa
return node != null && node.getKey().equals(value);
}
+ @Override
public boolean remove(Object obj) {
if (obj instanceof Map.Entry == false) {
return false;
@@ -1966,6 +1975,7 @@ public class TreeBidiMap<K extends Compa
* @param obj the object to be compared for equality with this entry.
* @return true if the specified object is equal to this entry.
*/
+ @Override
public boolean equals(final Object obj) {
if (obj == this) {
return true;
@@ -1980,6 +1990,7 @@ public class TreeBidiMap<K extends Compa
/**
* @return the hash code value for this map entry.
*/
+ @Override
public int hashCode() {
if (!calculatedHashCode) {
hashcodeValue = getKey().hashCode() ^ getValue().hashCode();
@@ -2108,14 +2119,17 @@ public class TreeBidiMap<K extends Compa
return TreeBidiMap.this;
}
+ @Override
public boolean equals(Object obj) {
return TreeBidiMap.this.doEquals(obj, DataElement.VALUE);
}
+ @Override
public int hashCode() {
return TreeBidiMap.this.doHashCode(DataElement.VALUE);
}
+ @Override
public String toString() {
return TreeBidiMap.this.doToString(DataElement.VALUE);
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java Wed Jul 21 17:39:49 2010
@@ -72,47 +72,57 @@ public final class UnmodifiableBidiMap<K
}
//-----------------------------------------------------------------------
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public V put(K key, V value) {
throw new UnsupportedOperationException();
}
+ @Override
public void putAll(Map<? extends K, ? extends V> mapToCopy) {
throw new UnsupportedOperationException();
}
+ @Override
public V remove(Object key) {
throw new UnsupportedOperationException();
}
+ @Override
public Set<Map.Entry<K, V>> entrySet() {
Set<Map.Entry<K, V>> set = super.entrySet();
return UnmodifiableEntrySet.decorate(set);
}
+ @Override
public Set<K> keySet() {
Set<K> set = super.keySet();
return UnmodifiableSet.decorate(set);
}
+ @Override
public Collection<V> values() {
Collection<V> coll = super.values();
return UnmodifiableCollection.decorate(coll);
}
//-----------------------------------------------------------------------
+ @Override
public K removeValue(Object value) {
throw new UnsupportedOperationException();
}
+ @Override
public MapIterator<K, V> mapIterator() {
MapIterator<K, V> it = decorated().mapIterator();
return UnmodifiableMapIterator.decorate(it);
}
+ @Override
public synchronized BidiMap<V, K> inverseBidiMap() {
if (inverse == null) {
inverse = new UnmodifiableBidiMap<V, K>(decorated().inverseBidiMap());
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java Wed Jul 21 17:39:49 2010
@@ -72,47 +72,57 @@ public final class UnmodifiableOrderedBi
}
//-----------------------------------------------------------------------
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public V put(K key, V value) {
throw new UnsupportedOperationException();
}
+ @Override
public void putAll(Map<? extends K, ? extends V> mapToCopy) {
throw new UnsupportedOperationException();
}
+ @Override
public V remove(Object key) {
throw new UnsupportedOperationException();
}
+ @Override
public Set<Map.Entry<K, V>> entrySet() {
Set<Map.Entry<K, V>> set = super.entrySet();
return UnmodifiableEntrySet.decorate(set);
}
+ @Override
public Set<K> keySet() {
Set<K> set = super.keySet();
return UnmodifiableSet.decorate(set);
}
+ @Override
public Collection<V> values() {
Collection<V> coll = super.values();
return UnmodifiableCollection.decorate(coll);
}
//-----------------------------------------------------------------------
+ @Override
public K removeValue(Object value) {
throw new UnsupportedOperationException();
}
+ @Override
public OrderedBidiMap<V, K> inverseBidiMap() {
return inverseOrderedBidiMap();
}
//-----------------------------------------------------------------------
+ @Override
public OrderedMapIterator<K, V> mapIterator() {
OrderedMapIterator<K, V> it = decorated().mapIterator();
return UnmodifiableOrderedMapIterator.decorate(it);
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java Wed Jul 21 17:39:49 2010
@@ -74,49 +74,59 @@ public final class UnmodifiableSortedBid
}
//-----------------------------------------------------------------------
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public V put(K key, V value) {
throw new UnsupportedOperationException();
}
+ @Override
public void putAll(Map<? extends K, ? extends V> mapToCopy) {
throw new UnsupportedOperationException();
}
+ @Override
public V remove(Object key) {
throw new UnsupportedOperationException();
}
+ @Override
public Set<Map.Entry<K, V>> entrySet() {
Set<Map.Entry<K, V>> set = super.entrySet();
return UnmodifiableEntrySet.decorate(set);
}
+ @Override
public Set<K> keySet() {
Set<K> set = super.keySet();
return UnmodifiableSet.decorate(set);
}
+ @Override
public Collection<V> values() {
Collection<V> coll = super.values();
return UnmodifiableCollection.decorate(coll);
}
//-----------------------------------------------------------------------
+ @Override
public K removeValue(Object value) {
throw new UnsupportedOperationException();
}
//-----------------------------------------------------------------------
+ @Override
public OrderedMapIterator<K, V> mapIterator() {
OrderedMapIterator<K, V> it = decorated().mapIterator();
return UnmodifiableOrderedMapIterator.decorate(it);
}
//-----------------------------------------------------------------------
+ @Override
public SortedBidiMap<V, K> inverseBidiMap() {
if (inverse == null) {
inverse = new UnmodifiableSortedBidiMap<V, K>(decorated().inverseBidiMap());
@@ -125,16 +135,19 @@ public final class UnmodifiableSortedBid
return inverse;
}
+ @Override
public SortedMap<K, V> subMap(K fromKey, K toKey) {
SortedMap<K, V> sm = decorated().subMap(fromKey, toKey);
return UnmodifiableSortedMap.decorate(sm);
}
+ @Override
public SortedMap<K, V> headMap(K toKey) {
SortedMap<K, V> sm = decorated().headMap(toKey);
return UnmodifiableSortedMap.decorate(sm);
}
+ @Override
public SortedMap<K, V> tailMap(K fromKey) {
SortedMap<K, V> sm = decorated().tailMap(fromKey);
return UnmodifiableSortedMap.decorate(sm);
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java Wed Jul 21 17:39:49 2010
@@ -59,6 +59,7 @@ public abstract class AbstractBufferDeco
*
* @return the decorated buffer
*/
+ @Override
protected Buffer<E> decorated() {
return (Buffer<E>) super.decorated();
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java Wed Jul 21 17:39:49 2010
@@ -108,6 +108,7 @@ public class BlockingBuffer<E> extends S
}
//-----------------------------------------------------------------------
+ @Override
public boolean add(E o) {
synchronized (lock) {
boolean result = collection.add(o);
@@ -116,6 +117,7 @@ public class BlockingBuffer<E> extends S
}
}
+ @Override
public boolean addAll(Collection<? extends E> c) {
synchronized (lock) {
boolean result = collection.addAll(c);
@@ -131,6 +133,7 @@ public class BlockingBuffer<E> extends S
*
* @throws BufferUnderflowException if an interrupt is received
*/
+ @Override
public E get() {
synchronized (lock) {
while (collection.isEmpty()) {
@@ -187,6 +190,7 @@ public class BlockingBuffer<E> extends S
*
* @throws BufferUnderflowException if an interrupt is received
*/
+ @Override
public E remove() {
synchronized (lock) {
while (collection.isEmpty()) {
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java Wed Jul 21 17:39:49 2010
@@ -107,6 +107,7 @@ public class BoundedBuffer<E> extends Sy
}
//-----------------------------------------------------------------------
+ @Override
public E remove() {
synchronized (lock) {
E returnValue = decorated().remove();
@@ -115,6 +116,7 @@ public class BoundedBuffer<E> extends Sy
}
}
+ @Override
public boolean add(E o) {
synchronized (lock) {
timeoutWait(1);
@@ -122,6 +124,7 @@ public class BoundedBuffer<E> extends Sy
}
}
+ @Override
public boolean addAll(final Collection<? extends E> c) {
synchronized (lock) {
timeoutWait(c.size());
@@ -129,6 +132,7 @@ public class BoundedBuffer<E> extends Sy
}
}
+ @Override
public Iterator<E> iterator() {
return new NotifyingIterator(collection.iterator());
}
@@ -184,6 +188,7 @@ public class BoundedBuffer<E> extends Sy
super(it);
}
+ @Override
public void remove() {
synchronized (lock) {
iterator.remove();
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java Wed Jul 21 17:39:49 2010
@@ -171,6 +171,7 @@ public class BoundedFifoBuffer<E> extend
*
* @return this buffer's size
*/
+ @Override
public int size() {
int size = 0;
@@ -190,6 +191,7 @@ public class BoundedFifoBuffer<E> extend
*
* @return true if this buffer is empty
*/
+ @Override
public boolean isEmpty() {
return size() == 0;
}
@@ -215,6 +217,7 @@ public class BoundedFifoBuffer<E> extend
/**
* Clears this buffer.
*/
+ @Override
public void clear() {
full = false;
start = 0;
@@ -230,6 +233,7 @@ public class BoundedFifoBuffer<E> extend
* @throws NullPointerException if the given element is null
* @throws BufferOverflowException if this buffer is full
*/
+ @Override
public boolean add(E element) {
if (null == element) {
throw new NullPointerException("Attempted to add null object to buffer");
@@ -322,6 +326,7 @@ public class BoundedFifoBuffer<E> extend
*
* @return an iterator over this buffer's elements
*/
+ @Override
public Iterator<E> iterator() {
return new Iterator<E>() {
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java Wed Jul 21 17:39:49 2010
@@ -86,6 +86,7 @@ public class CircularFifoBuffer<E> exten
* @param element the element to add
* @return true, always
*/
+ @Override
public boolean add(E element) {
if (isFull()) {
remove();
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java Wed Jul 21 17:39:49 2010
@@ -81,6 +81,7 @@ public class PredicatedBuffer<E> extends
*
* @return the decorated buffer
*/
+ @Override
protected Buffer<E> decorated() {
return (Buffer<E>) super.decorated();
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java Wed Jul 21 17:39:49 2010
@@ -224,6 +224,7 @@ public class PriorityBuffer<E> extends A
*
* @return the number of elements in this buffer
*/
+ @Override
public int size() {
return size;
}
@@ -231,6 +232,7 @@ public class PriorityBuffer<E> extends A
/**
* Clears all elements from the buffer.
*/
+ @Override
@SuppressWarnings("unchecked")
public void clear() {
elements = (E[]) new Object[elements.length]; // for gc
@@ -245,6 +247,7 @@ public class PriorityBuffer<E> extends A
* @param element the element to be added
* @return true always
*/
+ @Override
public boolean add(E element) {
if (isAtCapacity()) {
grow();
@@ -467,6 +470,7 @@ public class PriorityBuffer<E> extends A
*
* @return an iterator over this heap's elements
*/
+ @Override
public Iterator<E> iterator() {
return new Iterator<E>() {
@@ -526,6 +530,7 @@ public class PriorityBuffer<E> extends A
*
* @return a string representation of this heap
*/
+ @Override
public String toString() {
final StringBuilder sb = new StringBuilder();
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java Wed Jul 21 17:39:49 2010
@@ -79,6 +79,7 @@ public class SynchronizedBuffer<E>
*
* @return the decorated buffer
*/
+ @Override
protected Buffer<E> decorated() {
return (Buffer<E>) super.decorated();
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java Wed Jul 21 17:39:49 2010
@@ -150,6 +150,7 @@ public class UnboundedFifoBuffer<E> exte
*
* @return this buffer's size
*/
+ @Override
public int size() {
int size = 0;
@@ -167,6 +168,7 @@ public class UnboundedFifoBuffer<E> exte
*
* @return true if this buffer is empty
*/
+ @Override
public boolean isEmpty() {
return (size() == 0);
}
@@ -178,6 +180,7 @@ public class UnboundedFifoBuffer<E> exte
* @return true, always
* @throws NullPointerException if the given element is null
*/
+ @Override
@SuppressWarnings("unchecked")
public boolean add(final E obj) {
if (obj == null) {
@@ -272,6 +275,7 @@ public class UnboundedFifoBuffer<E> exte
*
* @return an iterator over this buffer's elements
*/
+ @Override
public Iterator<E> iterator() {
return new Iterator<E>() {
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java Wed Jul 21 17:39:49 2010
@@ -99,35 +99,43 @@ public final class UnmodifiableBuffer<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 E remove() {
throw new UnsupportedOperationException();
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java Wed Jul 21 17:39:49 2010
@@ -135,14 +135,17 @@ public abstract class AbstractCollection
return decorated().retainAll(coll);
}
+ @Override
public boolean equals(Object object) {
return object == this || 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/collection/AbstractUntypedCollectionDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java Wed Jul 21 17:39:49 2010
@@ -110,14 +110,17 @@ public abstract class AbstractUntypedCol
return decorated().retainAll(coll);
}
+ @Override
public boolean equals(Object object) {
return object == this || 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/collection/PredicatedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/PredicatedCollection.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/PredicatedCollection.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/PredicatedCollection.java Wed Jul 21 17:39:49 2010
@@ -112,6 +112,7 @@ public class PredicatedCollection<E> ext
* @return the result of adding to the underlying collection
* @throws IllegalArgumentException if the add is invalid
*/
+ @Override
public boolean add(E object) {
validate(object);
return decorated().add(object);
@@ -126,6 +127,7 @@ public class PredicatedCollection<E> ext
* @return the result of adding to the underlying collection
* @throws IllegalArgumentException if the add is invalid
*/
+ @Override
public boolean addAll(Collection<? extends E> coll) {
for (E item : coll) {
validate(item);
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java Wed Jul 21 17:39:49 2010
@@ -188,6 +188,7 @@ public class SynchronizedCollection<E> i
}
}
+ @Override
public boolean equals(Object object) {
synchronized (lock) {
if (object == this) {
@@ -197,12 +198,14 @@ public class SynchronizedCollection<E> i
}
}
+ @Override
public int hashCode() {
synchronized (lock) {
return decorated().hashCode();
}
}
+ @Override
public String toString() {
synchronized (lock) {
return decorated().toString();
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/TransformedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/TransformedCollection.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/TransformedCollection.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/TransformedCollection.java Wed Jul 21 17:39:49 2010
@@ -137,10 +137,12 @@ public class TransformedCollection<E> ex
}
//-----------------------------------------------------------------------
+ @Override
public boolean add(E object) {
return decorated().add(transform(object));
}
+ @Override
public boolean addAll(Collection<? extends E> coll) {
return decorated().addAll(transform(coll));
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java Wed Jul 21 17:39:49 2010
@@ -103,30 +103,37 @@ public final class UnmodifiableBoundedCo
}
//-----------------------------------------------------------------------
+ @Override
public Iterator<E> iterator() {
return UnmodifiableIterator.decorate(decorated().iterator());
}
+ @Override
public boolean add(E object) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean addAll(Collection<? extends E> coll) {
throw new UnsupportedOperationException();
}
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean remove(Object object) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean removeAll(Collection<?> coll) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean retainAll(Collection<?> coll) {
throw new UnsupportedOperationException();
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java Wed Jul 21 17:39:49 2010
@@ -71,30 +71,37 @@ public final class UnmodifiableCollectio
}
//-----------------------------------------------------------------------
+ @Override
public Iterator<E> iterator() {
return UnmodifiableIterator.decorate(decorated().iterator());
}
+ @Override
public boolean add(E object) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean addAll(Collection<? extends E> coll) {
throw new UnsupportedOperationException();
}
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean remove(Object object) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean removeAll(Collection<?> coll) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean retainAll(Collection<?> coll) {
throw new UnsupportedOperationException();
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/BooleanComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/BooleanComparator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/BooleanComparator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/BooleanComparator.java Wed Jul 21 17:39:49 2010
@@ -149,6 +149,7 @@ public final class BooleanComparator imp
*
* @return a hash code for this comparator.
*/
+ @Override
public int hashCode() {
int hash = "BooleanComparator".hashCode();
return trueFirst ? -1 * hash : hash;
@@ -166,6 +167,7 @@ public final class BooleanComparator imp
* @param object the object to compare to
* @return true if equal
*/
+ @Override
public boolean equals(Object object) {
return (this == object) ||
((object instanceof BooleanComparator) &&
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ComparableComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ComparableComparator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ComparableComparator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ComparableComparator.java Wed Jul 21 17:39:49 2010
@@ -100,6 +100,7 @@ public class ComparableComparator<E exte
* @return a hash code for this comparator.
* @since Commons Collections 3.0
*/
+ @Override
public int hashCode() {
return "ComparableComparator".hashCode();
}
@@ -119,6 +120,7 @@ public class ComparableComparator<E exte
* @return true if equal
* @since Commons Collections 3.0
*/
+ @Override
public boolean equals(Object object) {
return (this == object) ||
((null != object) && (object.getClass().equals(this.getClass())));
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ComparatorChain.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ComparatorChain.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ComparatorChain.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ComparatorChain.java Wed Jul 21 17:39:49 2010
@@ -299,6 +299,7 @@ public class ComparatorChain<E> implemen
* @return a suitable hash code
* @since Commons Collections 3.0
*/
+ @Override
public int hashCode() {
int hash = 0;
if (null != comparatorChain) {
@@ -326,6 +327,7 @@ public class ComparatorChain<E> implemen
* @return true if equal
* @since Commons Collections 3.0
*/
+ @Override
public boolean equals(Object object) {
if (this == object) {
return true;
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/NullComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/NullComparator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/NullComparator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/NullComparator.java Wed Jul 21 17:39:49 2010
@@ -151,6 +151,7 @@ public class NullComparator<E> implement
*
* @return a hash code for this comparator.
**/
+ @Override
public int hashCode() {
return (nullsAreHigh ? -1 : 1) * nonNullComparator.hashCode();
}
@@ -166,6 +167,7 @@ public class NullComparator<E> implement
* (i.e. <code>null</code> high or low) and with equivalent underlying
* non-<code>null</code> object comparators.
**/
+ @Override
public boolean equals(Object obj) {
if(obj == null) { return false; }
if(obj == this) { return true; }
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ReverseComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ReverseComparator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ReverseComparator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ReverseComparator.java Wed Jul 21 17:39:49 2010
@@ -87,6 +87,7 @@ public class ReverseComparator<E> implem
* @return a suitable hash code
* @since Commons Collections 3.0
*/
+ @Override
public int hashCode() {
return "ReverseComparator".hashCode() ^ comparator.hashCode();
}
@@ -107,6 +108,7 @@ public class ReverseComparator<E> implem
* @return true if equal
* @since Commons Collections 3.0
*/
+ @Override
public boolean equals(Object object) {
if (this == object) {
return true;
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java Wed Jul 21 17:39:49 2010
@@ -144,6 +144,7 @@ public class ArrayListIterator<E> extend
* @return the next element
* @throws NoSuchElementException if there is no next element
*/
+ @Override
@SuppressWarnings("unchecked")
public E next() {
if (hasNext() == false) {
@@ -208,6 +209,7 @@ public class ArrayListIterator<E> extend
/**
* Resets the iterator back to the start index.
*/
+ @Override
public void reset() {
super.reset();
this.lastItemIndex = -1;
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java Wed Jul 21 17:39:49 2010
@@ -160,6 +160,7 @@ public class EntrySetMapIterator<K, V> i
*
* @return a string version of the iterator
*/
+ @Override
public String toString() {
if (last != null) {
return "MapIterator[" + getKey() + "=" + getValue() + "]";
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java Wed Jul 21 17:39:49 2010
@@ -133,6 +133,7 @@ public class ObjectArrayListIterator<E>
* @return the next element
* @throws NoSuchElementException if there is no next element
*/
+ @Override
public E next() {
if (hasNext() == false) {
throw new NoSuchElementException();
@@ -198,6 +199,7 @@ public class ObjectArrayListIterator<E>
/**
* Resets the iterator back to the start index.
*/
+ @Override
public void reset() {
super.reset();
this.lastItemIndex = -1;
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java Wed Jul 21 17:39:49 2010
@@ -72,6 +72,7 @@ public abstract class AbstractKeyValue<K
*
* @return a String view of the entry
*/
+ @Override
public String toString() {
return new StringBuilder()
.append(getKey())
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java Wed Jul 21 17:39:49 2010
@@ -67,6 +67,7 @@ public abstract class AbstractMapEntry<K
* @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) {
@@ -88,6 +89,7 @@ public abstract class AbstractMapEntry<K
*
* @return a suitable hash code
*/
+ @Override
public int hashCode() {
return (getKey() == null ? 0 : getKey().hashCode()) ^
(getValue() == null ? 0 : getValue().hashCode());
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java Wed Jul 21 17:39:49 2010
@@ -69,6 +69,7 @@ public abstract class AbstractMapEntryDe
return entry.setValue(object);
}
+ @Override
public boolean equals(Object object) {
if (object == this) {
return true;
@@ -76,10 +77,12 @@ public abstract class AbstractMapEntryDe
return entry.equals(object);
}
+ @Override
public int hashCode() {
return entry.hashCode();
}
+ @Override
public String toString() {
return entry.toString();
}
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java Wed Jul 21 17:39:49 2010
@@ -129,6 +129,7 @@ public class DefaultKeyValue<K, V> exten
* @param obj the object to compare to
* @return true if equal key and value
*/
+ @Override
@SuppressWarnings("unchecked")
public boolean equals(final Object obj) {
if (obj == this) {
@@ -152,6 +153,7 @@ public class DefaultKeyValue<K, V> exten
*
* @return a suitable hash code
*/
+ @Override
public int hashCode() {
return (getKey() == null ? 0 : getKey().hashCode()) ^
(getValue() == null ? 0 : getValue().hashCode());
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/MultiKey.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/MultiKey.java?rev=966327&r1=966326&r2=966327&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/MultiKey.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/MultiKey.java Wed Jul 21 17:39:49 2010
@@ -219,6 +219,7 @@ public class MultiKey<K> implements Seri
* @param other the other object to compare to
* @return true if equal
*/
+ @Override
public boolean equals(Object other) {
if (other == this) {
return true;
@@ -240,6 +241,7 @@ public class MultiKey<K> implements Seri
*
* @return the hash code
*/
+ @Override
public int hashCode() {
return hashCode;
}
@@ -249,6 +251,7 @@ public class MultiKey<K> implements Seri
*
* @return a debugging string
*/
+ @Override
public String toString() {
return "MultiKey" + Arrays.asList(keys).toString();
}