You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2013/01/07 18:15:24 UTC
svn commit: r1429905 [8/26] - in /commons/proper/collections/trunk/src:
main/java/org/apache/commons/collections/
main/java/org/apache/commons/collections/bag/
main/java/org/apache/commons/collections/bidimap/
main/java/org/apache/commons/collections/b...
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java Mon Jan 7 17:15:14 2013
@@ -83,7 +83,7 @@ public class FilterListIterator<E> imple
*
* @param iterator the iterator to use
*/
- public FilterListIterator(ListIterator<? extends E> iterator ) {
+ public FilterListIterator(final ListIterator<? extends E> iterator ) {
super();
this.iterator = iterator;
}
@@ -94,7 +94,7 @@ public class FilterListIterator<E> imple
* @param iterator the iterator to use
* @param predicate the predicate to use
*/
- public FilterListIterator(ListIterator<? extends E> iterator, Predicate<? super E> predicate) {
+ public FilterListIterator(final ListIterator<? extends E> iterator, final Predicate<? super E> predicate) {
super();
this.iterator = iterator;
this.predicate = predicate;
@@ -106,14 +106,14 @@ public class FilterListIterator<E> imple
*
* @param predicate the predicate to use.
*/
- public FilterListIterator(Predicate<? super E> predicate) {
+ public FilterListIterator(final Predicate<? super E> predicate) {
super();
this.predicate = predicate;
}
//-----------------------------------------------------------------------
/** Not supported. */
- public void add(E o) {
+ public void add(final E o) {
throw new UnsupportedOperationException("FilterListIterator.add(Object) is not supported.");
}
@@ -132,7 +132,7 @@ public class FilterListIterator<E> imple
}
}
nextIndex++;
- E temp = nextObject;
+ final E temp = nextObject;
clearNextObject();
return temp;
}
@@ -148,7 +148,7 @@ public class FilterListIterator<E> imple
}
}
nextIndex--;
- E temp = previousObject;
+ final E temp = previousObject;
clearPreviousObject();
return temp;
}
@@ -163,7 +163,7 @@ public class FilterListIterator<E> imple
}
/** Not supported. */
- public void set(E o) {
+ public void set(final E o) {
throw new UnsupportedOperationException("FilterListIterator.set(Object) is not supported.");
}
@@ -183,7 +183,7 @@ public class FilterListIterator<E> imple
*
* @param iterator the iterator to use
*/
- public void setListIterator(ListIterator<? extends E> iterator) {
+ public void setListIterator(final ListIterator<? extends E> iterator) {
this.iterator = iterator;
}
@@ -202,7 +202,7 @@ public class FilterListIterator<E> imple
*
* @param predicate the transformer to use
*/
- public void setPredicate(Predicate<? super E> predicate) {
+ public void setPredicate(final Predicate<? super E> predicate) {
this.predicate = predicate;
}
@@ -229,7 +229,7 @@ public class FilterListIterator<E> imple
return false;
}
while (iterator.hasNext()) {
- E object = iterator.next();
+ final E object = iterator.next();
if (predicate.evaluate(object)) {
nextObject = object;
nextObjectSet = true;
@@ -261,7 +261,7 @@ public class FilterListIterator<E> imple
return false;
}
while (iterator.hasPrevious()) {
- E object = iterator.previous();
+ final E object = iterator.previous();
if (predicate.evaluate(object)) {
previousObject = object;
previousObjectSet = true;
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java Mon Jan 7 17:15:14 2013
@@ -93,7 +93,7 @@ public class IteratorChain<E> implements
* @param iterator the first child iterator in the IteratorChain, not null
* @throws NullPointerException if the iterator is null
*/
- public IteratorChain(Iterator<? extends E> iterator) {
+ public IteratorChain(final Iterator<? extends E> iterator) {
super();
addIterator(iterator);
}
@@ -108,7 +108,7 @@ public class IteratorChain<E> implements
* @param second the second child iterator in the IteratorChain, not null
* @throws NullPointerException if either iterator is null
*/
- public IteratorChain(Iterator<? extends E> first, Iterator<? extends E> second) {
+ public IteratorChain(final Iterator<? extends E> first, final Iterator<? extends E> second) {
super();
addIterator(first);
addIterator(second);
@@ -123,9 +123,9 @@ public class IteratorChain<E> implements
* @param iteratorChain the array of iterators, not null
* @throws NullPointerException if iterators array is or contains null
*/
- public IteratorChain(Iterator<? extends E>... iteratorChain) {
+ public IteratorChain(final Iterator<? extends E>... iteratorChain) {
super();
- for (Iterator<? extends E> element : iteratorChain) {
+ for (final Iterator<? extends E> element : iteratorChain) {
addIterator(element);
}
}
@@ -142,9 +142,9 @@ public class IteratorChain<E> implements
* @throws ClassCastException if iterators collection doesn't contain an
* iterator
*/
- public IteratorChain(Collection<Iterator<? extends E>> iteratorChain) {
+ public IteratorChain(final Collection<Iterator<? extends E>> iteratorChain) {
super();
- for (Iterator<? extends E> iterator : iteratorChain) {
+ for (final Iterator<? extends E> iterator : iteratorChain) {
addIterator(iterator);
}
}
@@ -157,7 +157,7 @@ public class IteratorChain<E> implements
* @throws IllegalStateException if I've already started iterating
* @throws NullPointerException if the iterator is null
*/
- public void addIterator(Iterator<? extends E> iterator) {
+ public void addIterator(final Iterator<? extends E> iterator) {
checkLocked();
if (iterator == null) {
throw new NullPointerException("Iterator must not be null");
@@ -174,7 +174,7 @@ public class IteratorChain<E> implements
* @throws IllegalStateException if I've already started iterating
* @throws NullPointerException if the iterator is null
*/
- public void setIterator(int index, Iterator<? extends E> iterator)
+ public void setIterator(final int index, final Iterator<? extends E> iterator)
throws IndexOutOfBoundsException {
checkLocked();
if (iterator == null) {
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java Mon Jan 7 17:15:14 2013
@@ -45,7 +45,7 @@ public class IteratorEnumeration<E> impl
*
* @param iterator the iterator to use
*/
- public IteratorEnumeration(Iterator<? extends E> iterator) {
+ public IteratorEnumeration(final Iterator<? extends E> iterator) {
super();
this.iterator = iterator;
}
@@ -90,7 +90,7 @@ public class IteratorEnumeration<E> impl
*
* @param iterator the new underlying iterator
*/
- public void setIterator(Iterator<? extends E> iterator) {
+ public void setIterator(final Iterator<? extends E> iterator) {
this.iterator = iterator;
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java Mon Jan 7 17:15:14 2013
@@ -95,7 +95,7 @@ public class IteratorIterable<E> impleme
*
* @param iterator the iterator to use.
*/
- public IteratorIterable(Iterator<? extends E> iterator) {
+ public IteratorIterable(final Iterator<? extends E> iterator) {
this(iterator, false);
}
@@ -106,7 +106,7 @@ public class IteratorIterable<E> impleme
* @param iterator the iterator to use.
* @param multipleUse <code>true</code> if the new iterable can be used in multiple iterations
*/
- public IteratorIterable(Iterator<? extends E> iterator, boolean multipleUse) {
+ public IteratorIterable(final Iterator<? extends E> iterator, final boolean multipleUse) {
super();
if (multipleUse && !(iterator instanceof ResettableIterator)) {
this.iterator = new ListIteratorWrapper<E>(iterator);
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java Mon Jan 7 17:15:14 2013
@@ -74,7 +74,7 @@ public class ListIteratorWrapper<E> impl
* @param iterator the iterator to wrap
* @throws NullPointerException if the iterator is null
*/
- public ListIteratorWrapper(Iterator<? extends E> iterator) {
+ public ListIteratorWrapper(final Iterator<? extends E> iterator) {
super();
if (iterator == null) {
throw new NullPointerException("Iterator must not be null");
@@ -92,9 +92,10 @@ public class ListIteratorWrapper<E> impl
* @throws UnsupportedOperationException if the underlying iterator is not of
* type {@link ListIterator}
*/
- public void add(E obj) throws UnsupportedOperationException {
+ public void add(final E obj) throws UnsupportedOperationException {
if (iterator instanceof ListIterator) {
@SuppressWarnings("unchecked")
+ final
ListIterator<E> li = (ListIterator<E>) iterator;
li.add(obj);
return;
@@ -121,7 +122,7 @@ public class ListIteratorWrapper<E> impl
*/
public boolean hasPrevious() {
if (iterator instanceof ListIterator) {
- ListIterator<?> li = (ListIterator<?>) iterator;
+ final ListIterator<?> li = (ListIterator<?>) iterator;
return li.hasPrevious();
}
return currentIndex > 0;
@@ -143,7 +144,7 @@ public class ListIteratorWrapper<E> impl
return list.get(currentIndex - 1);
}
- E retval = iterator.next();
+ final E retval = iterator.next();
list.add(retval);
++currentIndex;
++wrappedIteratorIndex;
@@ -158,7 +159,7 @@ public class ListIteratorWrapper<E> impl
*/
public int nextIndex() {
if (iterator instanceof ListIterator) {
- ListIterator<?> li = (ListIterator<?>) iterator;
+ final ListIterator<?> li = (ListIterator<?>) iterator;
return li.nextIndex();
}
return currentIndex;
@@ -173,6 +174,7 @@ public class ListIteratorWrapper<E> impl
public E previous() throws NoSuchElementException {
if (iterator instanceof ListIterator) {
@SuppressWarnings("unchecked")
+ final
ListIterator<E> li = (ListIterator<E>) iterator;
return li.previous();
}
@@ -191,7 +193,7 @@ public class ListIteratorWrapper<E> impl
*/
public int previousIndex() {
if (iterator instanceof ListIterator) {
- ListIterator<?> li = (ListIterator<?>) iterator;
+ final ListIterator<?> li = (ListIterator<?>) iterator;
return li.previousIndex();
}
return currentIndex - 1;
@@ -229,9 +231,10 @@ public class ListIteratorWrapper<E> impl
* @throws UnsupportedOperationException if the underlying iterator is not of
* type {@link ListIterator}
*/
- public void set(E obj) throws UnsupportedOperationException {
+ public void set(final E obj) throws UnsupportedOperationException {
if (iterator instanceof ListIterator) {
@SuppressWarnings("unchecked")
+ final
ListIterator<E> li = (ListIterator<E>) iterator;
li.set(obj);
return;
@@ -249,7 +252,7 @@ public class ListIteratorWrapper<E> impl
*/
public void reset() {
if (iterator instanceof ListIterator) {
- ListIterator<?> li = (ListIterator<?>) iterator;
+ final ListIterator<?> li = (ListIterator<?>) iterator;
while (li.previousIndex() >= 0) {
li.previous();
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java Mon Jan 7 17:15:14 2013
@@ -38,7 +38,7 @@ import org.apache.commons.collections.Re
public class LoopingIterator<E> implements ResettableIterator<E> {
/** The collection to base the iterator on */
- private Collection<? extends E> collection;
+ private final Collection<? extends E> collection;
/** The current iterator */
private Iterator<? extends E> iterator;
@@ -51,7 +51,7 @@ public class LoopingIterator<E> implemen
* @param coll the collection to wrap
* @throws NullPointerException if the collection is null
*/
- public LoopingIterator(Collection<? extends E> coll) {
+ public LoopingIterator(final Collection<? extends E> coll) {
if (coll == null) {
throw new NullPointerException("The collection must not be null");
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java Mon Jan 7 17:15:14 2013
@@ -40,7 +40,7 @@ import org.apache.commons.collections.Re
public class LoopingListIterator<E> implements ResettableListIterator<E> {
/** The list to base the iterator on */
- private List<E> list;
+ private final List<E> list;
/** The current list iterator */
private ListIterator<E> iterator;
@@ -54,7 +54,7 @@ public class LoopingListIterator<E> impl
* @param list the list to wrap
* @throws NullPointerException if the list it null
*/
- public LoopingListIterator(List<E> list) {
+ public LoopingListIterator(final List<E> list) {
if (list == null) {
throw new NullPointerException("The list must not be null");
}
@@ -211,7 +211,7 @@ public class LoopingListIterator<E> impl
* @throws UnsupportedOperationException if the add method is not
* supported by the iterator implementation of the underlying list
*/
- public void add(E obj) {
+ public void add(final E obj) {
iterator.add(obj);
}
@@ -227,7 +227,7 @@ public class LoopingListIterator<E> impl
* @throws UnsupportedOperationException if the set method is not
* supported by the iterator implementation of the underlying list
*/
- public void set(E obj) {
+ public void set(final E obj) {
iterator.set(obj);
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java Mon Jan 7 17:15:14 2013
@@ -62,7 +62,7 @@ public class ObjectArrayIterator<E>
* @param array the array to iterate over
* @throws NullPointerException if <code>array</code> is <code>null</code>
*/
- public ObjectArrayIterator(E... array) {
+ public ObjectArrayIterator(final E... array) {
this(array, 0, array.length);
}
@@ -75,7 +75,7 @@ public class ObjectArrayIterator<E>
* @throws NullPointerException if <code>array</code> is <code>null</code>
* @throws IndexOutOfBoundsException if the start index is out of bounds
*/
- public ObjectArrayIterator(E array[], int start) {
+ public ObjectArrayIterator(final E array[], final int start) {
this(array, start, array.length);
}
@@ -90,7 +90,7 @@ public class ObjectArrayIterator<E>
* @throws IllegalArgumentException if end index is before the start
* @throws NullPointerException if <code>array</code> is <code>null</code>
*/
- public ObjectArrayIterator(E array[], int start, int end) {
+ public ObjectArrayIterator(final E array[], final int start, final int end) {
super();
if (start < 0) {
throw new ArrayIndexOutOfBoundsException("Start index must not be less than zero");
@@ -171,7 +171,7 @@ public class ObjectArrayIterator<E>
* @throws IllegalStateException if the <code>array</code> was set in the constructor
* @throws NullPointerException if <code>array</code> is <code>null</code>
*/
- public void setArray(E[] array) {
+ public void setArray(final E[] array) {
if (this.array != null) {
throw new IllegalStateException("The array to iterate over has already been set");
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java Mon Jan 7 17:15:14 2013
@@ -65,7 +65,7 @@ public class ObjectArrayListIterator<E>
* @param array the array to iterate over
* @throws NullPointerException if <code>array</code> is <code>null</code>
*/
- public ObjectArrayListIterator(E... array) {
+ public ObjectArrayListIterator(final E... array) {
super(array);
}
@@ -78,7 +78,7 @@ public class ObjectArrayListIterator<E>
* @throws NullPointerException if <code>array</code> is <code>null</code>
* @throws IndexOutOfBoundsException if the start index is out of bounds
*/
- public ObjectArrayListIterator(E[] array, int start) {
+ public ObjectArrayListIterator(final E[] array, final int start) {
super(array, start);
}
@@ -93,7 +93,7 @@ public class ObjectArrayListIterator<E>
* @throws IllegalArgumentException if end index is before the start
* @throws NullPointerException if <code>array</code> is <code>null</code>
*/
- public ObjectArrayListIterator(E[] array, int start, int end) {
+ public ObjectArrayListIterator(final E[] array, final int start, final int end) {
super(array, start, end);
}
@@ -163,7 +163,7 @@ public class ObjectArrayListIterator<E>
* @param obj the object to add
* @throws UnsupportedOperationException always thrown.
*/
- public void add(E obj) {
+ public void add(final E obj) {
throw new UnsupportedOperationException("add() method is not supported");
}
@@ -184,7 +184,7 @@ public class ObjectArrayListIterator<E>
* @throws IllegalStateException if next() has not yet been called.
* @throws ClassCastException if the object type is unsuitable for the array
*/
- public void set(E obj) {
+ public void set(final E obj) {
if (this.lastItemIndex == -1) {
throw new IllegalStateException("must call next() or previous() before a call to set()");
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java Mon Jan 7 17:15:14 2013
@@ -102,7 +102,7 @@ public class ObjectGraphIterator<E> impl
* @param transformer the transformer to use, null will use a no effect transformer
*/
@SuppressWarnings("unchecked")
- public ObjectGraphIterator(E root, Transformer<? super E, ? extends E> transformer) {
+ public ObjectGraphIterator(final E root, final Transformer<? super E, ? extends E> transformer) {
super();
if (root instanceof Iterator) {
this.currentIterator = (Iterator<? extends E>) root;
@@ -122,7 +122,7 @@ public class ObjectGraphIterator<E> impl
*
* @param rootIterator the root iterator, null will result in an empty iterator
*/
- public ObjectGraphIterator(Iterator<? extends E> rootIterator) {
+ public ObjectGraphIterator(final Iterator<? extends E> rootIterator) {
super();
this.currentIterator = rootIterator;
this.transformer = null;
@@ -158,7 +158,7 @@ public class ObjectGraphIterator<E> impl
* @param value the value to start from
*/
@SuppressWarnings("unchecked")
- protected void findNext(E value) {
+ protected void findNext(final E value) {
if (value instanceof Iterator) {
// need to examine this iterator
findNextByIterator((Iterator<? extends E>) value);
@@ -174,7 +174,7 @@ public class ObjectGraphIterator<E> impl
*
* @param iterator the iterator to start from
*/
- protected void findNextByIterator(Iterator<? extends E> iterator) {
+ protected void findNextByIterator(final Iterator<? extends E> iterator) {
if (iterator != currentIterator) {
// recurse a level
if (currentIterator != null) {
@@ -224,7 +224,7 @@ public class ObjectGraphIterator<E> impl
throw new NoSuchElementException("No more elements in the iteration");
}
lastUsedIterator = currentIterator;
- E result = currentValue;
+ final E result = currentValue;
currentValue = null;
hasNext = false;
return result;
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java Mon Jan 7 17:15:14 2013
@@ -51,7 +51,7 @@ public class ReverseListIterator<E> impl
* @param list the list to create a reversed iterator for
* @throws NullPointerException if the list is null
*/
- public ReverseListIterator(List<E> list) {
+ public ReverseListIterator(final List<E> list) {
super();
this.list = list;
iterator = list.listIterator(list.size());
@@ -74,7 +74,7 @@ public class ReverseListIterator<E> impl
* @return the next element in the iterator
*/
public E next() {
- E obj = iterator.previous();
+ final E obj = iterator.previous();
validForUpdate = true;
return obj;
}
@@ -104,7 +104,7 @@ public class ReverseListIterator<E> impl
* @return the previous element in the iterator
*/
public E previous() {
- E obj = iterator.next();
+ final E obj = iterator.next();
validForUpdate = true;
return obj;
}
@@ -138,7 +138,7 @@ public class ReverseListIterator<E> impl
* @throws UnsupportedOperationException if the list is unmodifiable
* @throws IllegalStateException if the iterator is not in a valid state for set
*/
- public void set(E obj) {
+ public void set(final E obj) {
if (validForUpdate == false) {
throw new IllegalStateException("Cannot set to list until next() or previous() called");
}
@@ -152,7 +152,7 @@ public class ReverseListIterator<E> impl
* @throws UnsupportedOperationException if the list is unmodifiable
* @throws IllegalStateException if the iterator is not in a valid state for set
*/
- public void add(E obj) {
+ public void add(final E obj) {
// the validForUpdate flag is needed as the necessary previous()
// method call re-enables remove and add
if (validForUpdate == false) {
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java Mon Jan 7 17:15:14 2013
@@ -46,7 +46,7 @@ public class SingletonIterator<E>
*
* @param object the single object to return from the iterator
*/
- public SingletonIterator(E object) {
+ public SingletonIterator(final E object) {
this(object, true);
}
@@ -58,7 +58,7 @@ public class SingletonIterator<E>
* @param removeAllowed true if remove is allowed
* @since 3.1
*/
- public SingletonIterator(E object, boolean removeAllowed) {
+ public SingletonIterator(final E object, final boolean removeAllowed) {
super();
this.object = object;
this.removeAllowed = removeAllowed;
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java Mon Jan 7 17:15:14 2013
@@ -40,7 +40,7 @@ public class SingletonListIterator<E> im
*
* @param object the single object to return from the iterator
*/
- public SingletonListIterator(E object) {
+ public SingletonListIterator(final E object) {
super();
this.object = object;
}
@@ -145,7 +145,7 @@ public class SingletonListIterator<E> im
* @param obj the object to add
* @throws UnsupportedOperationException always
*/
- public void add(E obj) {
+ public void add(final E obj) {
throw new UnsupportedOperationException("add() is not supported by this iterator");
}
@@ -156,7 +156,7 @@ public class SingletonListIterator<E> im
* @throws IllegalStateException if <tt>next</tt> has not been called
* or the object has been removed
*/
- public void set(E obj) {
+ public void set(final E obj) {
if (!nextCalled || removed) {
throw new IllegalStateException();
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java Mon Jan 7 17:15:14 2013
@@ -49,7 +49,7 @@ public class TransformIterator<I, O> imp
*
* @param iterator the iterator to use
*/
- public TransformIterator(Iterator<? extends I> iterator) {
+ public TransformIterator(final Iterator<? extends I> iterator) {
super();
this.iterator = iterator;
}
@@ -62,7 +62,7 @@ public class TransformIterator<I, O> imp
* @param iterator the iterator to use
* @param transformer the transformer to use
*/
- public TransformIterator(Iterator<? extends I> iterator, Transformer<? super I, ? extends O> transformer) {
+ public TransformIterator(final Iterator<? extends I> iterator, final Transformer<? super I, ? extends O> transformer) {
super();
this.iterator = iterator;
this.transformer = transformer;
@@ -105,7 +105,7 @@ public class TransformIterator<I, O> imp
*
* @param iterator the iterator to use
*/
- public void setIterator(Iterator<? extends I> iterator) {
+ public void setIterator(final Iterator<? extends I> iterator) {
this.iterator = iterator;
}
@@ -125,7 +125,7 @@ public class TransformIterator<I, O> imp
*
* @param transformer the transformer to use
*/
- public void setTransformer(Transformer<? super I, ? extends O> transformer) {
+ public void setTransformer(final Transformer<? super I, ? extends O> transformer) {
this.transformer = transformer;
}
@@ -137,7 +137,7 @@ public class TransformIterator<I, O> imp
* @param source the object to transform
* @return the transformed object
*/
- protected O transform(I source) {
+ protected O transform(final I source) {
return transformer.transform(source);
}
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java Mon Jan 7 17:15:14 2013
@@ -37,7 +37,7 @@ public class UniqueFilterIterator<E> ext
*
* @param iterator the iterator to use
*/
- public UniqueFilterIterator(Iterator<E> iterator) {
+ public UniqueFilterIterator(final Iterator<E> iterator) {
super(iterator, UniquePredicate.uniquePredicate());
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java Mon Jan 7 17:15:14 2013
@@ -44,7 +44,7 @@ public final class UnmodifiableIterator<
* @return a new unmodifiable iterator
* @throws IllegalArgumentException if the iterator is null
*/
- public static <E> Iterator<E> unmodifiableIterator(Iterator<E> iterator) {
+ public static <E> Iterator<E> unmodifiableIterator(final Iterator<E> iterator) {
if (iterator == null) {
throw new IllegalArgumentException("Iterator must not be null");
}
@@ -60,7 +60,7 @@ public final class UnmodifiableIterator<
*
* @param iterator the iterator to decorate
*/
- private UnmodifiableIterator(Iterator<E> iterator) {
+ private UnmodifiableIterator(final Iterator<E> iterator) {
super();
this.iterator = iterator;
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java Mon Jan 7 17:15:14 2013
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Un
public final class UnmodifiableListIterator<E> implements ListIterator<E>, Unmodifiable {
/** The iterator being decorated */
- private ListIterator<E> iterator;
+ private final ListIterator<E> iterator;
//-----------------------------------------------------------------------
/**
@@ -42,7 +42,7 @@ public final class UnmodifiableListItera
* @return a new unmodifiable list iterator
* @throws IllegalArgumentException if the iterator is null
*/
- public static <E> ListIterator<E> umodifiableListIterator(ListIterator<E> iterator) {
+ public static <E> ListIterator<E> umodifiableListIterator(final ListIterator<E> iterator) {
if (iterator == null) {
throw new IllegalArgumentException("ListIterator must not be null");
}
@@ -58,7 +58,7 @@ public final class UnmodifiableListItera
*
* @param iterator the iterator to decorate
*/
- private UnmodifiableListIterator(ListIterator<E> iterator) {
+ private UnmodifiableListIterator(final ListIterator<E> iterator) {
super();
this.iterator = iterator;
}
@@ -92,11 +92,11 @@ public final class UnmodifiableListItera
throw new UnsupportedOperationException("remove() is not supported");
}
- public void set(E obj) {
+ public void set(final E obj) {
throw new UnsupportedOperationException("set() is not supported");
}
- public void add(E obj) {
+ public void add(final E obj) {
throw new UnsupportedOperationException("add() is not supported");
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java Mon Jan 7 17:15:14 2013
@@ -42,7 +42,7 @@ public final class UnmodifiableMapIterat
* @return a new unmodifiable map iterator
* @throws IllegalArgumentException if the iterator is null
*/
- public static <K, V> MapIterator<K, V> unmodifiableMapIterator(MapIterator<K, V> iterator) {
+ public static <K, V> MapIterator<K, V> unmodifiableMapIterator(final MapIterator<K, V> iterator) {
if (iterator == null) {
throw new IllegalArgumentException("MapIterator must not be null");
}
@@ -58,7 +58,7 @@ public final class UnmodifiableMapIterat
*
* @param iterator the iterator to decorate
*/
- private UnmodifiableMapIterator(MapIterator<K, V> iterator) {
+ private UnmodifiableMapIterator(final MapIterator<K, V> iterator) {
super();
this.iterator = iterator;
}
@@ -80,7 +80,7 @@ public final class UnmodifiableMapIterat
return iterator.getValue();
}
- public V setValue(V value) {
+ public V setValue(final V value) {
throw new UnsupportedOperationException("setValue() is not supported");
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java Mon Jan 7 17:15:14 2013
@@ -31,7 +31,7 @@ public final class UnmodifiableOrderedMa
Unmodifiable {
/** The iterator being decorated */
- private OrderedMapIterator<K, V> iterator;
+ private final OrderedMapIterator<K, V> iterator;
//-----------------------------------------------------------------------
/**
@@ -43,7 +43,7 @@ public final class UnmodifiableOrderedMa
* @return a new unmodifiable ordered map iterator
* @throws IllegalArgumentException if the iterator is null
*/
- public static <K, V> OrderedMapIterator<K, V> unmodifiableOrderedMapIterator(OrderedMapIterator<K, V> iterator) {
+ public static <K, V> OrderedMapIterator<K, V> unmodifiableOrderedMapIterator(final OrderedMapIterator<K, V> iterator) {
if (iterator == null) {
throw new IllegalArgumentException("OrderedMapIterator must not be null");
}
@@ -59,7 +59,7 @@ public final class UnmodifiableOrderedMa
*
* @param iterator the iterator to decorate
*/
- private UnmodifiableOrderedMapIterator(OrderedMapIterator<K, V> iterator) {
+ private UnmodifiableOrderedMapIterator(final OrderedMapIterator<K, V> iterator) {
super();
this.iterator = iterator;
}
@@ -89,7 +89,7 @@ public final class UnmodifiableOrderedMa
return iterator.getValue();
}
- public V setValue(V value) {
+ public V setValue(final V value) {
throw new UnsupportedOperationException("setValue() is not supported");
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java Mon Jan 7 17:15:14 2013
@@ -38,7 +38,7 @@ public abstract class AbstractKeyValue<K
* @param key the key for the entry, may be null
* @param value the value for the entry, may be null
*/
- protected AbstractKeyValue(K key, V value) {
+ protected AbstractKeyValue(final K key, final V value) {
super();
this.key = key;
this.value = value;
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java Mon Jan 7 17:15:14 2013
@@ -33,7 +33,7 @@ public abstract class AbstractMapEntry<K
* @param key the key for the entry, may be null
* @param value the value for the entry, may be null
*/
- protected AbstractMapEntry(K key, V value) {
+ protected AbstractMapEntry(final K key, final V value) {
super(key, value);
}
@@ -48,8 +48,8 @@ public abstract class AbstractMapEntry<K
* @param value the new value
* @return the previous value
*/
- public V setValue(V value) {
- V answer = this.value;
+ public V setValue(final V value) {
+ final V answer = this.value;
this.value = value;
return answer;
}
@@ -63,14 +63,14 @@ public abstract class AbstractMapEntry<K
* @return true if equal key and value
*/
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (obj == this) {
return true;
}
if (obj instanceof Map.Entry == false) {
return false;
}
- Map.Entry<?, ?> other = (Map.Entry<?, ?>) obj;
+ final Map.Entry<?, ?> other = (Map.Entry<?, ?>) obj;
return
(getKey() == null ? other.getKey() == null : getKey().equals(other.getKey())) &&
(getValue() == null ? other.getValue() == null : getValue().equals(other.getValue()));
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java Mon Jan 7 17:15:14 2013
@@ -38,7 +38,7 @@ public abstract class AbstractMapEntryDe
* @param entry the <code>Map.Entry</code> to decorate, must not be null
* @throws IllegalArgumentException if the collection is null
*/
- public AbstractMapEntryDecorator(Map.Entry<K, V> entry) {
+ public AbstractMapEntryDecorator(final Map.Entry<K, V> entry) {
if (entry == null) {
throw new IllegalArgumentException("Map Entry must not be null");
}
@@ -64,12 +64,12 @@ public abstract class AbstractMapEntryDe
return entry.getValue();
}
- public V setValue(V object) {
+ public V setValue(final V object) {
return entry.setValue(object);
}
@Override
- public boolean equals(Object object) {
+ public boolean equals(final Object object) {
if (object == this) {
return true;
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java Mon Jan 7 17:15:14 2013
@@ -133,7 +133,7 @@ public class DefaultKeyValue<K, V> exten
return false;
}
- DefaultKeyValue<?, ?> other = (DefaultKeyValue<?, ?>) obj;
+ final DefaultKeyValue<?, ?> other = (DefaultKeyValue<?, ?>) obj;
return
(getKey() == null ? other.getKey() == null : getKey().equals(other.getKey())) &&
(getValue() == null ? other.getValue() == null : getValue().equals(other.getValue()));
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/MultiKey.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/MultiKey.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/MultiKey.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/MultiKey.java Mon Jan 7 17:15:14 2013
@@ -63,7 +63,7 @@ public class MultiKey<K> implements Seri
* @param key2 the second key
*/
@SuppressWarnings("unchecked")
- public MultiKey(K key1, K key2) {
+ public MultiKey(final K key1, final K key2) {
this((K[]) new Object[] { key1, key2 }, false);
}
@@ -78,7 +78,7 @@ public class MultiKey<K> implements Seri
* @param key3 the third key
*/
@SuppressWarnings("unchecked")
- public MultiKey(K key1, K key2, K key3) {
+ public MultiKey(final K key1, final K key2, final K key3) {
this((K[]) new Object[] {key1, key2, key3}, false);
}
@@ -94,7 +94,7 @@ public class MultiKey<K> implements Seri
* @param key4 the fourth key
*/
@SuppressWarnings("unchecked")
- public MultiKey(K key1, K key2, K key3, K key4) {
+ public MultiKey(final K key1, final K key2, final K key3, final K key4) {
this((K[]) new Object[] {key1, key2, key3, key4}, false);
}
@@ -111,7 +111,7 @@ public class MultiKey<K> implements Seri
* @param key5 the fifth key
*/
@SuppressWarnings("unchecked")
- public MultiKey(K key1, K key2, K key3, K key4, K key5) {
+ public MultiKey(final K key1, final K key2, final K key3, final K key4, final K key5) {
this((K[]) new Object[] {key1, key2, key3, key4, key5}, false);
}
@@ -126,7 +126,7 @@ public class MultiKey<K> implements Seri
* @param keys the array of keys, not null
* @throws IllegalArgumentException if the key array is null
*/
- public MultiKey(K[] keys) {
+ public MultiKey(final K[] keys) {
this(keys, true);
}
@@ -154,7 +154,7 @@ public class MultiKey<K> implements Seri
* @throws IllegalArgumentException if the key array is null
* @since 3.1
*/
- public MultiKey(K[] keys, boolean makeClone) {
+ public MultiKey(final K[] keys, final boolean makeClone) {
super();
if (keys == null) {
throw new IllegalArgumentException("The array of keys must not be null");
@@ -192,7 +192,7 @@ public class MultiKey<K> implements Seri
* @throws IndexOutOfBoundsException if the index is invalid
* @since 3.1
*/
- public K getKey(int index) {
+ public K getKey(final int index) {
return keys[index];
}
@@ -217,12 +217,12 @@ public class MultiKey<K> implements Seri
* @return true if equal
*/
@Override
- public boolean equals(Object other) {
+ public boolean equals(final Object other) {
if (other == this) {
return true;
}
if (other instanceof MultiKey) {
- MultiKey<?> otherMulti = (MultiKey<?>) other;
+ final MultiKey<?> otherMulti = (MultiKey<?>) other;
return Arrays.equals(keys, otherMulti.keys);
}
return false;
@@ -257,10 +257,10 @@ public class MultiKey<K> implements Seri
* Calculate the hash code of the instance using the provided keys.
* @param keys the keys to calculate the hash code for
*/
- private void calculateHashCode(Object[] keys)
+ private void calculateHashCode(final Object[] keys)
{
int total = 0;
- for (Object key : keys) {
+ for (final Object key : keys) {
if (key != null) {
total ^= key.hashCode();
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java Mon Jan 7 17:15:14 2013
@@ -47,7 +47,7 @@ public class TiedMapEntry<K, V> implemen
* @param map the map
* @param key the key
*/
- public TiedMapEntry(Map<K, V> map, K key) {
+ public TiedMapEntry(final Map<K, V> map, final K key) {
super();
this.map = map;
this.key = key;
@@ -80,7 +80,7 @@ public class TiedMapEntry<K, V> implemen
* @return the old value
* @throws IllegalArgumentException if the value is set to this map entry
*/
- public V setValue(V value) {
+ public V setValue(final V value) {
if (value == this) {
throw new IllegalArgumentException("Cannot set value to this map entry");
}
@@ -96,15 +96,15 @@ public class TiedMapEntry<K, V> implemen
* @return true if equal key and value
*/
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (obj == this) {
return true;
}
if (obj instanceof Map.Entry == false) {
return false;
}
- Map.Entry<?,?> other = (Map.Entry<?,?>) obj;
- Object value = getValue();
+ final Map.Entry<?,?> other = (Map.Entry<?,?>) obj;
+ final Object value = getValue();
return
(key == null ? other.getKey() == null : key.equals(other.getKey())) &&
(value == null ? other.getValue() == null : value.equals(other.getValue()));
@@ -119,7 +119,7 @@ public class TiedMapEntry<K, V> implemen
*/
@Override
public int hashCode() {
- Object value = getValue();
+ final Object value = getValue();
return (getKey() == null ? 0 : getKey().hashCode()) ^
(value == null ? 0 : value.hashCode());
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java Mon Jan 7 17:15:14 2013
@@ -68,7 +68,7 @@ public final class UnmodifiableMapEntry<
* @throws UnsupportedOperationException always
*/
@Override
- public V setValue(V value) {
+ public V setValue(final V value) {
throw new UnsupportedOperationException("setValue() is not supported");
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/AbstractLinkedList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/AbstractLinkedList.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/AbstractLinkedList.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/AbstractLinkedList.java Mon Jan 7 17:15:14 2013
@@ -82,7 +82,7 @@ public abstract class AbstractLinkedList
*
* @param coll the collection to copy
*/
- protected AbstractLinkedList(Collection<? extends E> coll) {
+ protected AbstractLinkedList(final Collection<? extends E> coll) {
super();
init();
addAll(coll);
@@ -108,8 +108,8 @@ public abstract class AbstractLinkedList
return size() == 0;
}
- public E get(int index) {
- Node<E> node = getNode(index, false);
+ public E get(final int index) {
+ final Node<E> node = getNode(index, false);
return node.getValue();
}
@@ -123,13 +123,13 @@ public abstract class AbstractLinkedList
return new LinkedListIterator<E>(this, 0);
}
- public ListIterator<E> listIterator(int fromIndex) {
+ public ListIterator<E> listIterator(final int fromIndex) {
return new LinkedListIterator<E>(this, fromIndex);
}
//-----------------------------------------------------------------------
- public int indexOf(Object value) {
+ public int indexOf(final Object value) {
int i = 0;
for (Node<E> node = header.next; node != header; node = node.next) {
if (isEqualValue(node.getValue(), value)) {
@@ -140,7 +140,7 @@ public abstract class AbstractLinkedList
return -1;
}
- public int lastIndexOf(Object value) {
+ public int lastIndexOf(final Object value) {
int i = size - 1;
for (Node<E> node = header.previous; node != header; node = node.previous) {
if (isEqualValue(node.getValue(), value)) {
@@ -151,12 +151,12 @@ public abstract class AbstractLinkedList
return -1;
}
- public boolean contains(Object value) {
+ public boolean contains(final Object value) {
return indexOf(value) != -1;
}
- public boolean containsAll(Collection<?> coll) {
- for (Object o : coll) {
+ public boolean containsAll(final Collection<?> coll) {
+ for (final Object o : coll) {
if (!contains(o)) {
return false;
}
@@ -174,7 +174,7 @@ public abstract class AbstractLinkedList
public <T> T[] toArray(T[] array) {
// Extend the array if needed
if (array.length < size) {
- Class<?> componentType = array.getClass().getComponentType();
+ final Class<?> componentType = array.getClass().getComponentType();
array = (T[]) Array.newInstance(componentType, size);
}
// Copy the values into the array
@@ -196,29 +196,29 @@ public abstract class AbstractLinkedList
* @param toIndexExclusive the index to end at
* @return the new sublist
*/
- public List<E> subList(int fromIndexInclusive, int toIndexExclusive) {
+ public List<E> subList(final int fromIndexInclusive, final int toIndexExclusive) {
return new LinkedSubList<E>(this, fromIndexInclusive, toIndexExclusive);
}
//-----------------------------------------------------------------------
- public boolean add(E value) {
+ public boolean add(final E value) {
addLast(value);
return true;
}
- public void add(int index, E value) {
- Node<E> node = getNode(index, true);
+ public void add(final int index, final E value) {
+ final Node<E> node = getNode(index, true);
addNodeBefore(node, value);
}
- public boolean addAll(Collection<? extends E> coll) {
+ public boolean addAll(final Collection<? extends E> coll) {
return addAll(size, coll);
}
- public boolean addAll(int index, Collection<? extends E> coll) {
- Node<E> node = getNode(index, true);
- for (E e : coll) {
+ public boolean addAll(final int index, final Collection<? extends E> coll) {
+ final Node<E> node = getNode(index, true);
+ for (final E e : coll) {
addNodeBefore(node, e);
}
return true;
@@ -226,14 +226,14 @@ public abstract class AbstractLinkedList
//-----------------------------------------------------------------------
- public E remove(int index) {
- Node<E> node = getNode(index, false);
- E oldValue = node.getValue();
+ public E remove(final int index) {
+ final Node<E> node = getNode(index, false);
+ final E oldValue = node.getValue();
removeNode(node);
return oldValue;
}
- public boolean remove(Object value) {
+ public boolean remove(final Object value) {
for (Node<E> node = header.next; node != header; node = node.next) {
if (isEqualValue(node.getValue(), value)) {
removeNode(node);
@@ -252,9 +252,9 @@ public abstract class AbstractLinkedList
* <code>coll</code> that provides a fast (e.g. O(1)) implementation of
* {@link Collection#contains(Object)}.
*/
- public boolean removeAll(Collection<?> coll) {
+ public boolean removeAll(final Collection<?> coll) {
boolean modified = false;
- Iterator<E> it = iterator();
+ final Iterator<E> it = iterator();
while (it.hasNext()) {
if (coll.contains(it.next())) {
it.remove();
@@ -275,9 +275,9 @@ public abstract class AbstractLinkedList
* <code>coll</code> that provides a fast (e.g. O(1)) implementation of
* {@link Collection#contains(Object)}.
*/
- public boolean retainAll(Collection<?> coll) {
+ public boolean retainAll(final Collection<?> coll) {
boolean modified = false;
- Iterator<E> it = iterator();
+ final Iterator<E> it = iterator();
while (it.hasNext()) {
if (coll.contains(it.next()) == false) {
it.remove();
@@ -287,9 +287,9 @@ public abstract class AbstractLinkedList
return modified;
}
- public E set(int index, E value) {
- Node<E> node = getNode(index, false);
- E oldValue = node.getValue();
+ public E set(final int index, final E value) {
+ final Node<E> node = getNode(index, false);
+ final E oldValue = node.getValue();
updateNode(node, value);
return oldValue;
}
@@ -301,7 +301,7 @@ public abstract class AbstractLinkedList
//-----------------------------------------------------------------------
public E getFirst() {
- Node<E> node = header.next;
+ final Node<E> node = header.next;
if (node == header) {
throw new NoSuchElementException();
}
@@ -309,61 +309,61 @@ public abstract class AbstractLinkedList
}
public E getLast() {
- Node<E> node = header.previous;
+ final Node<E> node = header.previous;
if (node == header) {
throw new NoSuchElementException();
}
return node.getValue();
}
- public boolean addFirst(E o) {
+ public boolean addFirst(final E o) {
addNodeAfter(header, o);
return true;
}
- public boolean addLast(E o) {
+ public boolean addLast(final E o) {
addNodeBefore(header, o);
return true;
}
public E removeFirst() {
- Node<E> node = header.next;
+ final Node<E> node = header.next;
if (node == header) {
throw new NoSuchElementException();
}
- E oldValue = node.getValue();
+ final E oldValue = node.getValue();
removeNode(node);
return oldValue;
}
public E removeLast() {
- Node<E> node = header.previous;
+ final Node<E> node = header.previous;
if (node == header) {
throw new NoSuchElementException();
}
- E oldValue = node.getValue();
+ final E oldValue = node.getValue();
removeNode(node);
return oldValue;
}
//-----------------------------------------------------------------------
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (obj == this) {
return true;
}
if (obj instanceof List == false) {
return false;
}
- List<?> other = (List<?>) obj;
+ final List<?> other = (List<?>) obj;
if (other.size() != size()) {
return false;
}
- ListIterator<?> it1 = listIterator();
- ListIterator<?> it2 = other.listIterator();
+ final ListIterator<?> it1 = listIterator();
+ final ListIterator<?> it2 = other.listIterator();
while (it1.hasNext() && it2.hasNext()) {
- Object o1 = it1.next();
- Object o2 = it2.next();
+ final Object o1 = it1.next();
+ final Object o2 = it2.next();
if (!(o1 == null ? o2 == null : o1.equals(o2))) {
return false;
}
@@ -374,7 +374,7 @@ public abstract class AbstractLinkedList
@Override
public int hashCode() {
int hashCode = 1;
- for (E e : this) {
+ for (final E e : this) {
hashCode = 31 * hashCode + (e == null ? 0 : e.hashCode());
}
return hashCode;
@@ -385,13 +385,13 @@ public abstract class AbstractLinkedList
if (size() == 0) {
return "[]";
}
- StringBuilder buf = new StringBuilder(16 * size());
+ final StringBuilder buf = new StringBuilder(16 * size());
buf.append("[");
- Iterator<E> it = iterator();
+ final Iterator<E> it = iterator();
boolean hasNext = it.hasNext();
while (hasNext) {
- Object value = it.next();
+ final Object value = it.next();
buf.append(value == this ? "(this Collection)" : value);
hasNext = it.hasNext();
if (hasNext) {
@@ -412,7 +412,7 @@ public abstract class AbstractLinkedList
* @param value2 the second value to compare, may be null
* @return true if equal
*/
- protected boolean isEqualValue(Object value1, Object value2) {
+ protected boolean isEqualValue(final Object value1, final Object value2) {
return value1 == value2 || (value1 == null ? false : value1.equals(value2));
}
@@ -424,7 +424,7 @@ public abstract class AbstractLinkedList
* @param node node to update
* @param value new value of the node
*/
- protected void updateNode(Node<E> node, E value) {
+ protected void updateNode(final Node<E> node, final E value) {
node.setValue(value);
}
@@ -447,7 +447,7 @@ public abstract class AbstractLinkedList
* @param value value of the new node
* @return a new node containing the value
*/
- protected Node<E> createNode(E value) {
+ protected Node<E> createNode(final E value) {
return new Node<E>(value);
}
@@ -462,8 +462,8 @@ public abstract class AbstractLinkedList
* @param value value of the newly added node
* @throws NullPointerException if <code>node</code> is null
*/
- protected void addNodeBefore(Node<E> node, E value) {
- Node<E> newNode = createNode(value);
+ protected void addNodeBefore(final Node<E> node, final E value) {
+ final Node<E> newNode = createNode(value);
addNode(newNode, node);
}
@@ -478,8 +478,8 @@ public abstract class AbstractLinkedList
* @param value value of the newly added node
* @throws NullPointerException if <code>node</code> is null
*/
- protected void addNodeAfter(Node<E> node, E value) {
- Node<E> newNode = createNode(value);
+ protected void addNodeAfter(final Node<E> node, final E value) {
+ final Node<E> newNode = createNode(value);
addNode(newNode, node.next);
}
@@ -490,7 +490,7 @@ public abstract class AbstractLinkedList
* @param insertBeforeNode node to insert before
* @throws NullPointerException if either node is null
*/
- protected void addNode(Node<E> nodeToInsert, Node<E> insertBeforeNode) {
+ protected void addNode(final Node<E> nodeToInsert, final Node<E> insertBeforeNode) {
nodeToInsert.next = insertBeforeNode;
nodeToInsert.previous = insertBeforeNode.previous;
insertBeforeNode.previous.next = nodeToInsert;
@@ -505,7 +505,7 @@ public abstract class AbstractLinkedList
* @param node the node to remove
* @throws NullPointerException if <code>node</code> is null
*/
- protected void removeNode(Node<E> node) {
+ protected void removeNode(final Node<E> node) {
node.previous.next = node.next;
node.next.previous = node.previous;
size--;
@@ -533,7 +533,7 @@ public abstract class AbstractLinkedList
* the size of the list and endMakerAllowed is false; or greater than the
* size of the list
*/
- protected Node<E> getNode(int index, boolean endMarkerAllowed) throws IndexOutOfBoundsException {
+ protected Node<E> getNode(final int index, final boolean endMarkerAllowed) throws IndexOutOfBoundsException {
// Check the index is within the bounds
if (index < 0) {
throw new IndexOutOfBoundsException("Couldn't get the node: " +
@@ -573,7 +573,7 @@ public abstract class AbstractLinkedList
* @param subList the sublist to get an iterator for
* @return a new iterator on the given sublist
*/
- protected Iterator<E> createSubListIterator(LinkedSubList<E> subList) {
+ protected Iterator<E> createSubListIterator(final LinkedSubList<E> subList) {
return createSubListListIterator(subList, 0);
}
@@ -584,7 +584,7 @@ public abstract class AbstractLinkedList
* @param fromIndex the index to start from, relative to the sublist
* @return a new list iterator on the given sublist
*/
- protected ListIterator<E> createSubListListIterator(LinkedSubList<E> subList, int fromIndex) {
+ protected ListIterator<E> createSubListListIterator(final LinkedSubList<E> subList, final int fromIndex) {
return new LinkedSubListIterator<E>(subList, fromIndex);
}
@@ -595,10 +595,10 @@ public abstract class AbstractLinkedList
* The first serializable subclass must call this method from
* <code>writeObject</code>.
*/
- protected void doWriteObject(ObjectOutputStream outputStream) throws IOException {
+ protected void doWriteObject(final ObjectOutputStream outputStream) throws IOException {
// Write the size so we know how many nodes to read back
outputStream.writeInt(size());
- for (E e : this) {
+ for (final E e : this) {
outputStream.writeObject(e);
}
}
@@ -610,9 +610,9 @@ public abstract class AbstractLinkedList
* <code>readObject</code>.
*/
@SuppressWarnings("unchecked")
- protected void doReadObject(ObjectInputStream inputStream) throws IOException, ClassNotFoundException {
+ protected void doReadObject(final ObjectInputStream inputStream) throws IOException, ClassNotFoundException {
init();
- int size = inputStream.readInt();
+ final int size = inputStream.readInt();
for (int i = 0; i < size; i++) {
add((E) inputStream.readObject());
}
@@ -648,7 +648,7 @@ public abstract class AbstractLinkedList
*
* @param value the value to store
*/
- protected Node(E value) {
+ protected Node(final E value) {
super();
this.value = value;
}
@@ -660,7 +660,7 @@ public abstract class AbstractLinkedList
* @param next the next node in the list
* @param value the value to store
*/
- protected Node(Node<E> previous, Node<E> next, E value) {
+ protected Node(final Node<E> previous, final Node<E> next, final E value) {
super();
this.previous = previous;
this.next = next;
@@ -683,7 +683,7 @@ public abstract class AbstractLinkedList
* @param value the value
* @since 3.1
*/
- protected void setValue(E value) {
+ protected void setValue(final E value) {
this.value = value;
}
@@ -703,7 +703,7 @@ public abstract class AbstractLinkedList
* @param previous the previous node
* @since 3.1
*/
- protected void setPreviousNode(Node<E> previous) {
+ protected void setPreviousNode(final Node<E> previous) {
this.previous = previous;
}
@@ -723,7 +723,7 @@ public abstract class AbstractLinkedList
* @param next the next node
* @since 3.1
*/
- protected void setNextNode(Node<E> next) {
+ protected void setNextNode(final Node<E> next) {
this.next = next;
}
}
@@ -773,7 +773,7 @@ public abstract class AbstractLinkedList
* @param fromIndex the index to start at
* @throws IndexOutOfBoundsException if fromIndex is less than 0 or greater than the size of the list
*/
- protected LinkedListIterator(AbstractLinkedList<E> parent, int fromIndex) throws IndexOutOfBoundsException {
+ protected LinkedListIterator(final AbstractLinkedList<E> parent, final int fromIndex) throws IndexOutOfBoundsException {
super();
this.parent = parent;
this.expectedModCount = parent.modCount;
@@ -817,7 +817,7 @@ public abstract class AbstractLinkedList
if (!hasNext()) {
throw new NoSuchElementException("No element at index " + nextIndex + ".");
}
- E value = next.getValue();
+ final E value = next.getValue();
current = next;
next = next.next;
nextIndex++;
@@ -834,7 +834,7 @@ public abstract class AbstractLinkedList
throw new NoSuchElementException("Already at start of list.");
}
next = next.previous;
- E value = next.getValue();
+ final E value = next.getValue();
current = next;
nextIndex--;
return value;
@@ -864,12 +864,12 @@ public abstract class AbstractLinkedList
expectedModCount++;
}
- public void set(E obj) {
+ public void set(final E obj) {
checkModCount();
getLastNodeReturned().setValue(obj);
}
- public void add(E obj) {
+ public void add(final E obj) {
checkModCount();
parent.addNodeBefore(next, obj);
current = null;
@@ -888,7 +888,7 @@ public abstract class AbstractLinkedList
/** The parent list */
protected final LinkedSubList<E> sub;
- protected LinkedSubListIterator(LinkedSubList<E> sub, int startIndex) {
+ protected LinkedSubListIterator(final LinkedSubList<E> sub, final int startIndex) {
super(sub.parent, startIndex + sub.offset);
this.sub = sub;
}
@@ -909,7 +909,7 @@ public abstract class AbstractLinkedList
}
@Override
- public void add(E obj) {
+ public void add(final E obj) {
super.add(obj);
sub.expectedModCount = parent.modCount;
sub.size++;
@@ -937,7 +937,7 @@ public abstract class AbstractLinkedList
/** Sublist modCount */
int expectedModCount;
- protected LinkedSubList(AbstractLinkedList<E> parent, int fromIndex, int toIndex) {
+ protected LinkedSubList(final AbstractLinkedList<E> parent, final int fromIndex, final int toIndex) {
if (fromIndex < 0) {
throw new IndexOutOfBoundsException("fromIndex = " + fromIndex);
}
@@ -960,14 +960,14 @@ public abstract class AbstractLinkedList
}
@Override
- public E get(int index) {
+ public E get(final int index) {
rangeCheck(index, size);
checkModCount();
return parent.get(index + offset);
}
@Override
- public void add(int index, E obj) {
+ public void add(final int index, final E obj) {
rangeCheck(index, size + 1);
checkModCount();
parent.add(index + offset, obj);
@@ -977,10 +977,10 @@ public abstract class AbstractLinkedList
}
@Override
- public E remove(int index) {
+ public E remove(final int index) {
rangeCheck(index, size);
checkModCount();
- E result = parent.remove(index + offset);
+ final E result = parent.remove(index + offset);
expectedModCount = parent.modCount;
size--;
LinkedSubList.this.modCount++;
@@ -988,14 +988,14 @@ public abstract class AbstractLinkedList
}
@Override
- public boolean addAll(Collection<? extends E> coll) {
+ public boolean addAll(final Collection<? extends E> coll) {
return addAll(size, coll);
}
@Override
- public boolean addAll(int index, Collection<? extends E> coll) {
+ public boolean addAll(final int index, final Collection<? extends E> coll) {
rangeCheck(index, size + 1);
- int cSize = coll.size();
+ final int cSize = coll.size();
if (cSize == 0) {
return false;
}
@@ -1009,7 +1009,7 @@ public abstract class AbstractLinkedList
}
@Override
- public E set(int index, E obj) {
+ public E set(final int index, final E obj) {
rangeCheck(index, size);
checkModCount();
return parent.set(index + offset, obj);
@@ -1018,7 +1018,7 @@ public abstract class AbstractLinkedList
@Override
public void clear() {
checkModCount();
- Iterator<E> it = iterator();
+ final Iterator<E> it = iterator();
while (it.hasNext()) {
it.next();
it.remove();
@@ -1039,11 +1039,11 @@ public abstract class AbstractLinkedList
}
@Override
- public List<E> subList(int fromIndexInclusive, int toIndexExclusive) {
+ public List<E> subList(final int fromIndexInclusive, final int toIndexExclusive) {
return new LinkedSubList<E>(parent, fromIndexInclusive + offset, toIndexExclusive + offset);
}
- protected void rangeCheck(int index, int beyond) {
+ protected void rangeCheck(final int index, final int beyond) {
if (index < 0 || index >= beyond) {
throw new IndexOutOfBoundsException("Index '" + index + "' out of bounds for size '" + size + "'");
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/AbstractListDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/AbstractListDecorator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/AbstractListDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/AbstractListDecorator.java Mon Jan 7 17:15:14 2013
@@ -51,7 +51,7 @@ public abstract class AbstractListDecora
* @param list the list to decorate, must not be null
* @throws IllegalArgumentException if list is null
*/
- protected AbstractListDecorator(List<E> list) {
+ protected AbstractListDecorator(final List<E> list) {
super(list);
}
@@ -67,23 +67,23 @@ public abstract class AbstractListDecora
//-----------------------------------------------------------------------
- public void add(int index, E object) {
+ public void add(final int index, final E object) {
decorated().add(index, object);
}
- public boolean addAll(int index, Collection<? extends E> coll) {
+ public boolean addAll(final int index, final Collection<? extends E> coll) {
return decorated().addAll(index, coll);
}
- public E get(int index) {
+ public E get(final int index) {
return decorated().get(index);
}
- public int indexOf(Object object) {
+ public int indexOf(final Object object) {
return decorated().indexOf(object);
}
- public int lastIndexOf(Object object) {
+ public int lastIndexOf(final Object object) {
return decorated().lastIndexOf(object);
}
@@ -91,19 +91,19 @@ public abstract class AbstractListDecora
return decorated().listIterator();
}
- public ListIterator<E> listIterator(int index) {
+ public ListIterator<E> listIterator(final int index) {
return decorated().listIterator(index);
}
- public E remove(int index) {
+ public E remove(final int index) {
return decorated().remove(index);
}
- public E set(int index, E object) {
+ public E set(final int index, final E object) {
return decorated().set(index, object);
}
- public List<E> subList(int fromIndex, int toIndex) {
+ public List<E> subList(final int fromIndex, final int toIndex) {
return decorated().subList(fromIndex, toIndex);
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java Mon Jan 7 17:15:14 2013
@@ -42,7 +42,7 @@ public abstract class AbstractSerializab
* @param list the list to decorate, must not be null
* @throws IllegalArgumentException if list is null
*/
- protected AbstractSerializableListDecorator(List<E> list) {
+ protected AbstractSerializableListDecorator(final List<E> list) {
super(list);
}
@@ -53,7 +53,7 @@ public abstract class AbstractSerializab
* @param out the output stream
* @throws IOException
*/
- private void writeObject(ObjectOutputStream out) throws IOException {
+ private void writeObject(final ObjectOutputStream out) throws IOException {
out.defaultWriteObject();
out.writeObject(collection);
}
@@ -66,7 +66,7 @@ public abstract class AbstractSerializab
* @throws ClassNotFoundException
*/
@SuppressWarnings("unchecked")
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+ private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
collection = (Collection<E>) in.readObject();
}