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/03/18 18:15:39 UTC
svn commit: r1457875 - in /commons/proper/collections/trunk/src:
main/java/org/apache/commons/collections/
main/java/org/apache/commons/collections/bidimap/
main/java/org/apache/commons/collections/functors/
main/java/org/apache/commons/collections/ite...
Author: ggregory
Date: Mon Mar 18 17:15:38 2013
New Revision: 1457875
URL: http://svn.apache.org/r1457875
Log:
Add missing 'final' for parameters.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/CollectionUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/NodeListIterator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/AbstractQueueDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/PredicatedQueue.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/TransformedQueue.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/UnmodifiableQueue.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/collection/CompositeCollectionTest.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/LazyIteratorChainTest.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/CollectionUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/CollectionUtils.java?rev=1457875&r1=1457874&r2=1457875&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/CollectionUtils.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/CollectionUtils.java Mon Mar 18 17:15:38 2013
@@ -548,7 +548,7 @@ public class CollectionUtils {
}
final Transformer transformer = new Transformer() {
- public EquatorWrapper<?> transform(Object input) {
+ public EquatorWrapper<?> transform(final Object input) {
return new EquatorWrapper(equator, input);
}
};
@@ -579,7 +579,7 @@ public class CollectionUtils {
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (!(obj instanceof EquatorWrapper)) {
return false;
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java?rev=1457875&r1=1457874&r2=1457875&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/DualLinkedHashBidiMap.java Mon Mar 18 17:15:38 2013
@@ -52,7 +52,7 @@ public class DualLinkedHashBidiMap<K, V>
*
* @param map the map whose mappings are to be placed in this map
*/
- public DualLinkedHashBidiMap(Map<K, V> map) {
+ public DualLinkedHashBidiMap(final Map<K, V> map) {
super(new LinkedHashMap<K, V>(), new LinkedHashMap<V, K>());
putAll(map);
}
@@ -64,7 +64,7 @@ public class DualLinkedHashBidiMap<K, V>
* @param reverseMap the reverse direction map
* @param inverseBidiMap the inverse BidiMap
*/
- protected DualLinkedHashBidiMap(Map<K, V> normalMap, Map<V, K> reverseMap, BidiMap<V, K> inverseBidiMap) {
+ protected DualLinkedHashBidiMap(final Map<K, V> normalMap, final Map<V, K> reverseMap, final BidiMap<V, K> inverseBidiMap) {
super(normalMap, reverseMap, inverseBidiMap);
}
@@ -84,12 +84,12 @@ public class DualLinkedHashBidiMap<K, V>
// Serialization
//-----------------------------------------------------------------------
- private void writeObject(ObjectOutputStream out) throws IOException {
+ private void writeObject(final ObjectOutputStream out) throws IOException {
out.defaultWriteObject();
out.writeObject(normalMap);
}
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+ private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
normalMap = new LinkedHashMap<K, V>();
reverseMap = new LinkedHashMap<V, K>();
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java?rev=1457875&r1=1457874&r2=1457875&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java Mon Mar 18 17:15:38 2013
@@ -53,8 +53,8 @@ public class InstantiateFactory<T> imple
* @return a new instantiate factory
*/
public static <T> Factory<T> instantiateFactory(final Class<T> classToInstantiate,
- Class<?>[] paramTypes,
- Object[] args) {
+ final Class<?>[] paramTypes,
+ final Object[] args) {
if (classToInstantiate == null) {
throw new IllegalArgumentException("Class to instantiate must not be null");
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/NodeListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/NodeListIterator.java?rev=1457875&r1=1457874&r2=1457875&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/NodeListIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/NodeListIterator.java Mon Mar 18 17:15:38 2013
@@ -44,7 +44,7 @@ public class NodeListIterator implements
* @param node Node, who's child nodes are wrapped by this class. Must not be null
* @throws IllegalArgumentException if node is null
*/
- public NodeListIterator(Node node) {
+ public NodeListIterator(final Node node) {
if (node == null) {
throw new IllegalArgumentException("node must not be null!");
}
@@ -58,7 +58,7 @@ public class NodeListIterator implements
* @param nodeList node list, which is wrapped by this class. Must not be null
* @throws IllegalArgumentException if nodeList is null
*/
- public NodeListIterator(NodeList nodeList) {
+ public NodeListIterator(final NodeList nodeList) {
if (nodeList == null) {
throw new IllegalArgumentException("nodeList must not be null!");
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/AbstractQueueDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/AbstractQueueDecorator.java?rev=1457875&r1=1457874&r2=1457875&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/AbstractQueueDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/AbstractQueueDecorator.java Mon Mar 18 17:15:38 2013
@@ -64,7 +64,7 @@ public abstract class AbstractQueueDecor
//-----------------------------------------------------------------------
- public boolean offer(E obj) {
+ public boolean offer(final E obj) {
return decorated().offer(obj);
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/PredicatedQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/PredicatedQueue.java?rev=1457875&r1=1457874&r2=1457875&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/PredicatedQueue.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/PredicatedQueue.java Mon Mar 18 17:15:38 2013
@@ -94,7 +94,7 @@ public class PredicatedQueue<E> extends
* @return the result of adding to the underlying queue
* @throws IllegalArgumentException if the add is invalid
*/
- public boolean offer(E object) {
+ public boolean offer(final E object) {
validate(object);
return decorated().offer(object);
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/TransformedQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/TransformedQueue.java?rev=1457875&r1=1457874&r2=1457875&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/TransformedQueue.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/TransformedQueue.java Mon Mar 18 17:15:38 2013
@@ -111,7 +111,7 @@ public class TransformedQueue<E> extends
//-----------------------------------------------------------------------
- public boolean offer(E obj) {
+ public boolean offer(final E obj) {
return getQueue().offer(transform(obj));
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/UnmodifiableQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/UnmodifiableQueue.java?rev=1457875&r1=1457874&r2=1457875&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/UnmodifiableQueue.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/queue/UnmodifiableQueue.java Mon Mar 18 17:15:38 2013
@@ -134,7 +134,7 @@ public final class UnmodifiableQueue<E>
//-----------------------------------------------------------------------
@Override
- public boolean offer(E obj) {
+ public boolean offer(final E obj) {
throw new UnsupportedOperationException();
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java?rev=1457875&r1=1457874&r2=1457875&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java Mon Mar 18 17:15:38 2013
@@ -514,7 +514,7 @@ public class CollectionUtilsTest extends
// odd / even equator
final Equator<Integer> e = new Equator<Integer>() {
- public boolean equate(Integer o1, Integer o2) {
+ public boolean equate(final Integer o1, final Integer o2) {
if (o1.intValue() % 2 == 0 ^ o2.intValue() % 2 == 0) {
return false;
} else {
@@ -522,7 +522,7 @@ public class CollectionUtilsTest extends
}
}
- public int hash(Integer o) {
+ public int hash(final Integer o) {
return o.intValue() % 2 == 0 ? Integer.valueOf(0).hashCode() : Integer.valueOf(1).hashCode();
}
};
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java?rev=1457875&r1=1457874&r2=1457875&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java Mon Mar 18 17:15:38 2013
@@ -861,7 +861,7 @@ public class IteratorUtilsTest extends B
*/
private NodeList createNodeList(final Node[] nodes) {
return new NodeList() {
- public Node item(int index) {
+ public Node item(final int index) {
return nodes[index];
}
public int getLength() {
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/collection/CompositeCollectionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/collection/CompositeCollectionTest.java?rev=1457875&r1=1457874&r2=1457875&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/collection/CompositeCollectionTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/collection/CompositeCollectionTest.java Mon Mar 18 17:15:38 2013
@@ -127,7 +127,7 @@ public class CompositeCollectionTest<E>
setUpTest();
c.setMutator(new CompositeCollection.CollectionMutator<E>() {
- public boolean add(CompositeCollection<E> composite, List<Collection<E>> collections, E obj) {
+ public boolean add(final CompositeCollection<E> composite, final List<Collection<E>> collections, final E obj) {
for (final Collection<E> coll : collections) {
coll.add(obj);
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/LazyIteratorChainTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/LazyIteratorChainTest.java?rev=1457875&r1=1457874&r2=1457875&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/LazyIteratorChainTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/LazyIteratorChainTest.java Mon Mar 18 17:15:38 2013
@@ -60,7 +60,7 @@ public class LazyIteratorChainTest exten
public LazyIteratorChain<String> makeEmptyIterator() {
return new LazyIteratorChain<String>() {
@Override
- protected Iterator<String> nextIterator(int count) {
+ protected Iterator<String> nextIterator(final int count) {
return null;
}
};
@@ -70,7 +70,7 @@ public class LazyIteratorChainTest exten
public LazyIteratorChain<String> makeObject() {
final LazyIteratorChain<String> chain = new LazyIteratorChain<String>() {
@Override
- protected Iterator<String> nextIterator(int count) {
+ protected Iterator<String> nextIterator(final int count) {
switch (count) {
case 1:
return list1.iterator();
@@ -166,7 +166,7 @@ public class LazyIteratorChainTest exten
notEmpty.add("C");
final LazyIteratorChain<String> chain = new LazyIteratorChain<String>() {
@Override
- protected Iterator<String> nextIterator(int count) {
+ protected Iterator<String> nextIterator(final int count) {
switch (count) {
case 1:
return empty.iterator();
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java?rev=1457875&r1=1457874&r2=1457875&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/iterators/NodeListIteratorTest.java Mon Mar 18 17:15:38 2013
@@ -69,7 +69,7 @@ public class NodeListIteratorTest extend
@Override
public Iterator<Node> makeEmptyIterator() {
NodeList emptyNodeList = new NodeList() {
- public Node item(int index) {
+ public Node item(final int index) {
throw new IndexOutOfBoundsException();
}
public int getLength() {
@@ -91,7 +91,7 @@ public class NodeListIteratorTest extend
@Override
public Iterator<Node> makeObject() {
NodeList nodeList = new NodeList() {
- public Node item(int index) {
+ public Node item(final int index) {
return nodes[index];
}
public int getLength() {