commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1429905 [7/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...
Date Mon, 07 Jan 2013 17:15:24 GMT
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java Mon Jan  7 17:15:14 2013
@@ -46,7 +46,7 @@ class FunctorUtils {
      * @return the cloned predicates
      */
     @SuppressWarnings("unchecked")
-    static <T> Predicate<T>[] copy(Predicate<? super T>[] predicates) {
+    static <T> Predicate<T>[] copy(final Predicate<? super T>[] predicates) {
         if (predicates == null) {
             return null;
         }
@@ -66,7 +66,7 @@ class FunctorUtils {
      * @return the coerced predicate.
      */
     @SuppressWarnings("unchecked")
-    static <T> Predicate<T> coerce(Predicate<? super T> predicate){
+    static <T> Predicate<T> coerce(final Predicate<? super T> predicate){
         return (Predicate<T>) predicate;
     }
 
@@ -75,7 +75,7 @@ class FunctorUtils {
      *
      * @param predicates  the predicates to validate
      */
-    static void validate(Predicate<?>[] predicates) {
+    static void validate(final Predicate<?>[] predicates) {
         if (predicates == null) {
             throw new IllegalArgumentException("The predicate array must not be null");
         }
@@ -93,15 +93,16 @@ class FunctorUtils {
      * @param predicates  the predicates to validate
      * @return predicate array
      */
-    static <T> Predicate<T>[] validate(Collection<? extends Predicate<T>> predicates) {
+    static <T> Predicate<T>[] validate(final Collection<? extends Predicate<T>> predicates) {
         if (predicates == null) {
             throw new IllegalArgumentException("The predicate collection must not be null");
         }
         // convert to array like this to guarantee iterator() ordering
         @SuppressWarnings("unchecked") // OK
+        final
         Predicate<T>[] preds = new Predicate[predicates.size()];
         int i = 0;
-        for (Predicate<T> predicate : predicates) {
+        for (final Predicate<T> predicate : predicates) {
             preds[i] = predicate;
             if (preds[i] == null) {
                 throw new IllegalArgumentException("The predicate collection must not contain a null predicate, index " + i + " was null");
@@ -118,7 +119,7 @@ class FunctorUtils {
      * @return the cloned closures
      */
     @SuppressWarnings("unchecked")
-    static <E> Closure<E>[] copy(Closure<? super E>[] closures) {
+    static <E> Closure<E>[] copy(final Closure<? super E>[] closures) {
         if (closures == null) {
             return null;
         }
@@ -130,7 +131,7 @@ class FunctorUtils {
      *
      * @param closures  the closures to validate
      */
-    static void validate(Closure<?>[] closures) {
+    static void validate(final Closure<?>[] closures) {
         if (closures == null) {
             throw new IllegalArgumentException("The closure array must not be null");
         }
@@ -152,7 +153,7 @@ class FunctorUtils {
      * @return the coerced closure.
      */
     @SuppressWarnings("unchecked")
-    static <T> Closure<T> coerce(Closure<? super T> closure){
+    static <T> Closure<T> coerce(final Closure<? super T> closure){
         return (Closure<T>) closure;
     }
 
@@ -163,7 +164,7 @@ class FunctorUtils {
      * @return a clone of the transformers
      */
     @SuppressWarnings("unchecked")
-    static <I, O> Transformer<I, O>[] copy(Transformer<? super I, ? extends O>[] transformers) {
+    static <I, O> Transformer<I, O>[] copy(final Transformer<? super I, ? extends O>[] transformers) {
         if (transformers == null) {
             return null;
         }
@@ -175,7 +176,7 @@ class FunctorUtils {
      *
      * @param transformers  the transformers to validate
      */
-    static void validate(Transformer<?, ?>[] transformers) {
+    static void validate(final Transformer<?, ?>[] transformers) {
         if (transformers == null) {
             throw new IllegalArgumentException("The transformer array must not be null");
         }
@@ -198,7 +199,7 @@ class FunctorUtils {
      * @return the coerced transformer.
      */
     @SuppressWarnings("unchecked")
-    static <I, O> Transformer<I, O> coerce(Transformer<? super I, ? extends O> transformer) {
+    static <I, O> Transformer<I, O> coerce(final Transformer<? super I, ? extends O> transformer) {
         return (Transformer<I, O>) transformer;
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java Mon Jan  7 17:15:14 2013
@@ -43,7 +43,7 @@ public final class IdentityPredicate<T> 
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Predicate<T> identityPredicate(T object) {
+    public static <T> Predicate<T> identityPredicate(final T object) {
         if (object == null) {
             return NullPredicate.<T>nullPredicate();
         }
@@ -56,7 +56,7 @@ public final class IdentityPredicate<T> 
      *
      * @param object  the object to compare to
      */
-    public IdentityPredicate(T object) {
+    public IdentityPredicate(final T object) {
         super();
         iValue = object;
     }
@@ -68,7 +68,7 @@ public final class IdentityPredicate<T> 
      * @param object  the input object
      * @return true if input is the same object as the stored value
      */
-    public boolean evaluate(T object) {
+    public boolean evaluate(final T object) {
         return iValue == object;
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IfClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IfClosure.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IfClosure.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IfClosure.java Mon Jan  7 17:15:14 2013
@@ -53,7 +53,7 @@ public class IfClosure<E> implements Clo
      * @throws IllegalArgumentException if either argument is null
      * @since 3.2
      */
-    public static <E> Closure<E> ifClosure(Predicate<? super E> predicate, Closure<? super E> trueClosure) {
+    public static <E> Closure<E> ifClosure(final Predicate<? super E> predicate, final Closure<? super E> trueClosure) {
         return IfClosure.<E>ifClosure(predicate, trueClosure, NOPClosure.<E>nopClosure());
     }
 
@@ -67,9 +67,9 @@ public class IfClosure<E> implements Clo
      * @return the <code>if</code> closure
      * @throws IllegalArgumentException if any argument is null
      */
-    public static <E> Closure<E> ifClosure(Predicate<? super E> predicate,
-                                           Closure<? super E> trueClosure,
-                                           Closure<? super E> falseClosure) {
+    public static <E> Closure<E> ifClosure(final Predicate<? super E> predicate,
+                                           final Closure<? super E> trueClosure,
+                                           final Closure<? super E> falseClosure) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
@@ -90,7 +90,7 @@ public class IfClosure<E> implements Clo
      * @param trueClosure  closure used if true, not null
      * @since 3.2
      */
-    public IfClosure(Predicate<? super E> predicate, Closure<? super E> trueClosure) {
+    public IfClosure(final Predicate<? super E> predicate, final Closure<? super E> trueClosure) {
         this(predicate, trueClosure, NOPClosure.INSTANCE);
     }
 
@@ -102,7 +102,7 @@ public class IfClosure<E> implements Clo
      * @param trueClosure  closure used if true, not null
      * @param falseClosure  closure used if false, not null
      */
-    public IfClosure(Predicate<? super E> predicate, Closure<? super E> trueClosure, Closure<? super E> falseClosure) {
+    public IfClosure(final Predicate<? super E> predicate, final Closure<? super E> trueClosure, final Closure<? super E> falseClosure) {
         super();
         iPredicate = predicate;
         iTrueClosure = trueClosure;
@@ -114,7 +114,7 @@ public class IfClosure<E> implements Clo
      * 
      * @param input  the input object
      */
-    public void execute(E input) {
+    public void execute(final E input) {
         if (iPredicate.evaluate(input)) {
             iTrueClosure.execute(input);
         } else {

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java Mon Jan  7 17:15:14 2013
@@ -42,7 +42,7 @@ public final class InstanceofPredicate i
      * @return the predicate
      * @throws IllegalArgumentException if the class is null
      */
-    public static Predicate<Object> instanceOfPredicate(Class<?> type) {
+    public static Predicate<Object> instanceOfPredicate(final Class<?> type) {
         if (type == null) {
             throw new IllegalArgumentException("The type to check instanceof must not be null");
         }
@@ -55,7 +55,7 @@ public final class InstanceofPredicate i
      *
      * @param type  the type to check for
      */
-    public InstanceofPredicate(Class<?> type) {
+    public InstanceofPredicate(final Class<?> type) {
         super();
         iType = type;
     }
@@ -66,7 +66,7 @@ public final class InstanceofPredicate i
      * @param object  the input object
      * @return true if input is of stored type
      */
-    public boolean evaluate(Object object) {
+    public boolean evaluate(final Object object) {
         return iType.isInstance(object);
     }
 

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=1429905&r1=1429904&r2=1429905&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 Jan  7 17:15:14 2013
@@ -51,7 +51,7 @@ public class InstantiateFactory<T> imple
      * @param args  the constructor arguments
      * @return a new instantiate factory
      */
-    public static <T> Factory<T> instantiateFactory(Class<T> classToInstantiate, Class<?>[] paramTypes, Object[] args) {
+    public static <T> Factory<T> instantiateFactory(final Class<T> classToInstantiate, Class<?>[] paramTypes, Object[] args) {
         if (classToInstantiate == null) {
             throw new IllegalArgumentException("Class to instantiate must not be null");
         }
@@ -75,7 +75,7 @@ public class InstantiateFactory<T> imple
      * 
      * @param classToInstantiate  the class to instantiate
      */
-    public InstantiateFactory(Class<T> classToInstantiate) {
+    public InstantiateFactory(final Class<T> classToInstantiate) {
         super();
         iClassToInstantiate = classToInstantiate;
         iParamTypes = null;
@@ -91,7 +91,7 @@ public class InstantiateFactory<T> imple
      * @param paramTypes  the constructor parameter types, not cloned
      * @param args  the constructor arguments, not cloned
      */
-    public InstantiateFactory(Class<T> classToInstantiate, Class<?>[] paramTypes, Object[] args) {
+    public InstantiateFactory(final Class<T> classToInstantiate, final Class<?>[] paramTypes, final Object[] args) {
         super();
         iClassToInstantiate = classToInstantiate;
         iParamTypes = paramTypes;
@@ -106,7 +106,7 @@ public class InstantiateFactory<T> imple
         try {
             iConstructor = iClassToInstantiate.getConstructor(iParamTypes);
 
-        } catch (NoSuchMethodException ex) {
+        } catch (final NoSuchMethodException ex) {
             throw new IllegalArgumentException("InstantiateFactory: The constructor must exist and be public ");
         }
     }
@@ -124,11 +124,11 @@ public class InstantiateFactory<T> imple
 
         try {
             return iConstructor.newInstance(iArgs);
-        } catch (InstantiationException ex) {
+        } catch (final InstantiationException ex) {
             throw new FunctorException("InstantiateFactory: InstantiationException", ex);
-        } catch (IllegalAccessException ex) {
+        } catch (final IllegalAccessException ex) {
             throw new FunctorException("InstantiateFactory: Constructor must be public", ex);
-        } catch (InvocationTargetException ex) {
+        } catch (final InvocationTargetException ex) {
             throw new FunctorException("InstantiateFactory: Constructor threw an exception", ex);
         }
     }

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java Mon Jan  7 17:15:14 2013
@@ -89,7 +89,7 @@ public class InstantiateTransformer<T> i
      * @param paramTypes  the constructor parameter types, not cloned
      * @param args  the constructor arguments, not cloned
      */
-    public InstantiateTransformer(Class<?>[] paramTypes, Object[] args) {
+    public InstantiateTransformer(final Class<?>[] paramTypes, final Object[] args) {
         super();
         iParamTypes = paramTypes;
         iArgs = args;
@@ -101,21 +101,21 @@ public class InstantiateTransformer<T> i
      * @param input  the input object to transform
      * @return the transformed result
      */
-    public T transform(Class<? extends T> input) {
+    public T transform(final Class<? extends T> input) {
         try {
             if (input == null) {
                 throw new FunctorException(
                     "InstantiateTransformer: Input object was not an instanceof Class, it was a null object");
             }
-            Constructor<? extends T> con = input.getConstructor(iParamTypes);
+            final Constructor<? extends T> con = input.getConstructor(iParamTypes);
             return con.newInstance(iArgs);
-        } catch (NoSuchMethodException ex) {
+        } catch (final NoSuchMethodException ex) {
             throw new FunctorException("InstantiateTransformer: The constructor must exist and be public ");
-        } catch (InstantiationException ex) {
+        } catch (final InstantiationException ex) {
             throw new FunctorException("InstantiateTransformer: InstantiationException", ex);
-        } catch (IllegalAccessException ex) {
+        } catch (final IllegalAccessException ex) {
             throw new FunctorException("InstantiateTransformer: Constructor must be public", ex);
-        } catch (InvocationTargetException ex) {
+        } catch (final InvocationTargetException ex) {
             throw new FunctorException("InstantiateTransformer: Constructor threw an exception", ex);
         }
     }

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java Mon Jan  7 17:15:14 2013
@@ -48,7 +48,7 @@ public class InvokerTransformer<I, O> im
      * @return an invoker transformer
      * @since 3.1
      */
-    public static <I, O> Transformer<I, O> invokerTransformer(String methodName) {
+    public static <I, O> Transformer<I, O> invokerTransformer(final String methodName) {
         if (methodName == null) {
             throw new IllegalArgumentException("The method to invoke must not be null");
         }
@@ -63,7 +63,7 @@ public class InvokerTransformer<I, O> im
      * @param args  the arguments to pass to the method
      * @return an invoker transformer
      */
-    public static <I, O> Transformer<I, O> invokerTransformer(String methodName, Class<?>[] paramTypes, Object[] args) {
+    public static <I, O> Transformer<I, O> invokerTransformer(final String methodName, Class<?>[] paramTypes, Object[] args) {
         if (methodName == null) {
             throw new IllegalArgumentException("The method to invoke must not be null");
         }
@@ -86,7 +86,7 @@ public class InvokerTransformer<I, O> im
      * 
      * @param methodName  the method to call
      */
-    private InvokerTransformer(String methodName) {
+    private InvokerTransformer(final String methodName) {
         super();
         iMethodName = methodName;
         iParamTypes = null;
@@ -101,7 +101,7 @@ public class InvokerTransformer<I, O> im
      * @param paramTypes  the constructor parameter types, not cloned
      * @param args  the constructor arguments, not cloned
      */
-    public InvokerTransformer(String methodName, Class<?>[] paramTypes, Object[] args) {
+    public InvokerTransformer(final String methodName, final Class<?>[] paramTypes, final Object[] args) {
         super();
         iMethodName = methodName;
         iParamTypes = paramTypes;
@@ -115,21 +115,21 @@ public class InvokerTransformer<I, O> im
      * @return the transformed result, null if null input
      */
     @SuppressWarnings("unchecked")
-    public O transform(Object input) {
+    public O transform(final Object input) {
         if (input == null) {
             return null;
         }
         try {
-            Class<?> cls = input.getClass();
-            Method method = cls.getMethod(iMethodName, iParamTypes);
+            final Class<?> cls = input.getClass();
+            final Method method = cls.getMethod(iMethodName, iParamTypes);
             return (O) method.invoke(input, iArgs);
-        } catch (NoSuchMethodException ex) {
+        } catch (final NoSuchMethodException ex) {
             throw new FunctorException("InvokerTransformer: The method '" + iMethodName + "' on '" +
                                        input.getClass() + "' does not exist");
-        } catch (IllegalAccessException ex) {
+        } catch (final IllegalAccessException ex) {
             throw new FunctorException("InvokerTransformer: The method '" + iMethodName + "' on '" +
                                        input.getClass() + "' cannot be accessed");
-        } catch (InvocationTargetException ex) {
+        } catch (final InvocationTargetException ex) {
             throw new FunctorException("InvokerTransformer: The method '" + iMethodName + "' on '" +
                                        input.getClass() + "' threw an exception", ex);
         }

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/MapTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/MapTransformer.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/MapTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/MapTransformer.java Mon Jan  7 17:15:14 2013
@@ -44,7 +44,7 @@ public final class MapTransformer<I, O> 
      * @param map the map, not cloned
      * @return the transformer
      */
-    public static <I, O> Transformer<I, O> mapTransformer(Map<? super I, ? extends O> map) {
+    public static <I, O> Transformer<I, O> mapTransformer(final Map<? super I, ? extends O> map) {
         if (map == null) {
             return ConstantTransformer.<I, O>nullTransformer();
         }
@@ -57,7 +57,7 @@ public final class MapTransformer<I, O> 
      *
      * @param map  the map to use for lookup, not cloned
      */
-    private MapTransformer(Map<? super I, ? extends O> map) {
+    private MapTransformer(final Map<? super I, ? extends O> map) {
         super();
         iMap = map;
     }
@@ -68,7 +68,7 @@ public final class MapTransformer<I, O> 
      * @param input  the input object to transform
      * @return the transformed result
      */
-    public O transform(I input) {
+    public O transform(final I input) {
         return iMap.get(input);
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPClosure.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPClosure.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPClosure.java Mon Jan  7 17:15:14 2013
@@ -58,7 +58,7 @@ public final class NOPClosure<E> impleme
      *
      * @param input  the input object
      */
-    public void execute(E input) {
+    public void execute(final E input) {
         // do nothing
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java Mon Jan  7 17:15:14 2013
@@ -58,7 +58,7 @@ public class NOPTransformer<T> implement
      * @param input  the input object to transform
      * @return the transformed result which is the input
      */
-    public T transform(T input) {
+    public T transform(final T input) {
         return input;
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NonePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NonePredicate.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NonePredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NonePredicate.java Mon Jan  7 17:15:14 2013
@@ -51,7 +51,7 @@ public final class NonePredicate<T> impl
      * @throws IllegalArgumentException if the predicates array is null
      * @throws IllegalArgumentException if any predicate in the array is null
      */
-    public static <T> Predicate<T> nonePredicate(Predicate<? super T>... predicates) {
+    public static <T> Predicate<T> nonePredicate(final Predicate<? super T>... predicates) {
         FunctorUtils.validate(predicates);
         if (predicates.length == 0) {
             return TruePredicate.<T>truePredicate();
@@ -70,8 +70,8 @@ public final class NonePredicate<T> impl
      * @throws IllegalArgumentException if the predicates array is null
      * @throws IllegalArgumentException if any predicate in the array is null
      */
-    public static <T> Predicate<T> nonePredicate(Collection<? extends Predicate<T>> predicates) {
-        Predicate<? super T>[] preds = FunctorUtils.validate(predicates);
+    public static <T> Predicate<T> nonePredicate(final Collection<? extends Predicate<T>> predicates) {
+        final Predicate<? super T>[] preds = FunctorUtils.validate(predicates);
         if (preds.length == 0) {
             return TruePredicate.<T>truePredicate();
         }
@@ -84,7 +84,7 @@ public final class NonePredicate<T> impl
      *
      * @param predicates  the predicates to check, not cloned, not null
      */
-    public NonePredicate(Predicate<? super T>[] predicates) {
+    public NonePredicate(final Predicate<? super T>[] predicates) {
         super();
         iPredicates = predicates;
     }
@@ -95,8 +95,8 @@ public final class NonePredicate<T> impl
      * @param object  the input object
      * @return true if none of decorated predicates return true
      */
-    public boolean evaluate(T object) {
-        for (Predicate<? super T> iPredicate : iPredicates) {
+    public boolean evaluate(final T object) {
+        for (final Predicate<? super T> iPredicate : iPredicates) {
             if (iPredicate.evaluate(object)) {
                 return false;
             }

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java Mon Jan  7 17:15:14 2013
@@ -59,7 +59,7 @@ public final class NotNullPredicate<T> i
      * @param object  the object to evaluate
      * @return true if not null
      */
-    public boolean evaluate(T object) {
+    public boolean evaluate(final T object) {
         return object != null;
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotPredicate.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotPredicate.java Mon Jan  7 17:15:14 2013
@@ -42,7 +42,7 @@ public final class NotPredicate<T> imple
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Predicate<T> notPredicate(Predicate<? super T> predicate) {
+    public static <T> Predicate<T> notPredicate(final Predicate<? super T> predicate) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
@@ -55,7 +55,7 @@ public final class NotPredicate<T> imple
      * 
      * @param predicate  the predicate to call after the null check
      */
-    public NotPredicate(Predicate<? super T> predicate) {
+    public NotPredicate(final Predicate<? super T> predicate) {
         super();
         iPredicate = predicate;
     }
@@ -66,7 +66,7 @@ public final class NotPredicate<T> imple
      * @param object  the input object
      * @return true if predicate returns false
      */
-    public boolean evaluate(T object) {
+    public boolean evaluate(final T object) {
         return !iPredicate.evaluate(object);
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java Mon Jan  7 17:15:14 2013
@@ -43,7 +43,7 @@ public final class NullIsExceptionPredic
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Predicate<T> nullIsExceptionPredicate(Predicate<? super T> predicate) {
+    public static <T> Predicate<T> nullIsExceptionPredicate(final Predicate<? super T> predicate) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
@@ -56,7 +56,7 @@ public final class NullIsExceptionPredic
      * 
      * @param predicate  the predicate to call after the null check
      */
-    public NullIsExceptionPredicate(Predicate<? super T> predicate) {
+    public NullIsExceptionPredicate(final Predicate<? super T> predicate) {
         super();
         iPredicate = predicate;
     }
@@ -69,7 +69,7 @@ public final class NullIsExceptionPredic
      * @return true if decorated predicate returns true
      * @throws FunctorException if input is null
      */
-    public boolean evaluate(T object) {
+    public boolean evaluate(final T object) {
         if (object == null) {
             throw new FunctorException("Input Object must not be null");
         }

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java Mon Jan  7 17:15:14 2013
@@ -42,7 +42,7 @@ public final class NullIsFalsePredicate<
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Predicate<T> nullIsFalsePredicate(Predicate<? super T> predicate) {
+    public static <T> Predicate<T> nullIsFalsePredicate(final Predicate<? super T> predicate) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
@@ -55,7 +55,7 @@ public final class NullIsFalsePredicate<
      *
      * @param predicate  the predicate to call after the null check
      */
-    public NullIsFalsePredicate(Predicate<? super T> predicate) {
+    public NullIsFalsePredicate(final Predicate<? super T> predicate) {
         super();
         iPredicate = predicate;
     }
@@ -67,7 +67,7 @@ public final class NullIsFalsePredicate<
      * @param object  the input object
      * @return true if decorated predicate returns true, false if input is null
      */
-    public boolean evaluate(T object) {
+    public boolean evaluate(final T object) {
         if (object == null) {
             return false;
         }

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java Mon Jan  7 17:15:14 2013
@@ -42,7 +42,7 @@ public final class NullIsTruePredicate<T
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Predicate<T> nullIsTruePredicate(Predicate<? super T> predicate) {
+    public static <T> Predicate<T> nullIsTruePredicate(final Predicate<? super T> predicate) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
@@ -55,7 +55,7 @@ public final class NullIsTruePredicate<T
      * 
      * @param predicate  the predicate to call after the null check
      */
-    public NullIsTruePredicate(Predicate<? super T> predicate) {
+    public NullIsTruePredicate(final Predicate<? super T> predicate) {
         super();
         iPredicate = predicate;
     }
@@ -67,7 +67,7 @@ public final class NullIsTruePredicate<T
      * @param object  the input object
      * @return true if decorated predicate returns true or input is null
      */
-    public boolean evaluate(T object) {
+    public boolean evaluate(final T object) {
         if (object == null) {
             return true;
         }

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullPredicate.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullPredicate.java Mon Jan  7 17:15:14 2013
@@ -59,7 +59,7 @@ public final class NullPredicate<T> impl
      * @param object  the input object
      * @return true if input is null
      */
-    public boolean evaluate(T object) {
+    public boolean evaluate(final T object) {
         return object == null;
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OnePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OnePredicate.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OnePredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OnePredicate.java Mon Jan  7 17:15:14 2013
@@ -53,7 +53,7 @@ public final class OnePredicate<T> imple
      * @throws IllegalArgumentException if any predicate in the array is null
      */
     @SuppressWarnings("unchecked")
-    public static <T> Predicate<T> onePredicate(Predicate<? super T>... predicates) {
+    public static <T> Predicate<T> onePredicate(final Predicate<? super T>... predicates) {
         FunctorUtils.validate(predicates);
         if (predicates.length == 0) {
             return FalsePredicate.<T>falsePredicate();
@@ -73,8 +73,8 @@ public final class OnePredicate<T> imple
      * @throws IllegalArgumentException if the predicates array is null
      * @throws IllegalArgumentException if any predicate in the array is null
      */
-    public static <T> Predicate<T> onePredicate(Collection<? extends Predicate<T>> predicates) {
-        Predicate<? super T>[] preds = FunctorUtils.validate(predicates);
+    public static <T> Predicate<T> onePredicate(final Collection<? extends Predicate<T>> predicates) {
+        final Predicate<? super T>[] preds = FunctorUtils.validate(predicates);
         return new OnePredicate<T>(preds);
     }
 
@@ -84,7 +84,7 @@ public final class OnePredicate<T> imple
      * 
      * @param predicates  the predicates to check, not cloned, not null
      */
-    public OnePredicate(Predicate<? super T>[] predicates) {
+    public OnePredicate(final Predicate<? super T>[] predicates) {
         super();
         iPredicates = predicates;
     }
@@ -96,9 +96,9 @@ public final class OnePredicate<T> imple
      * @param object  the input object
      * @return true if only one decorated predicate returns true
      */
-    public boolean evaluate(T object) {
+    public boolean evaluate(final T object) {
         boolean match = false;
-        for (Predicate<? super T> iPredicate : iPredicates) {
+        for (final Predicate<? super T> iPredicate : iPredicates) {
             if (iPredicate.evaluate(object)) {
                 if (match) {
                     return false;

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OrPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OrPredicate.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OrPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OrPredicate.java Mon Jan  7 17:15:14 2013
@@ -45,7 +45,7 @@ public final class OrPredicate<T> implem
      * @return the <code>and</code> predicate
      * @throws IllegalArgumentException if either predicate is null
      */
-    public static <T> Predicate<T> orPredicate(Predicate<? super T> predicate1, Predicate<? super T> predicate2) {
+    public static <T> Predicate<T> orPredicate(final Predicate<? super T> predicate1, final Predicate<? super T> predicate2) {
         if (predicate1 == null || predicate2 == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
@@ -59,7 +59,7 @@ public final class OrPredicate<T> implem
      * @param predicate1  the first predicate to check, not null
      * @param predicate2  the second predicate to check, not null
      */
-    public OrPredicate(Predicate<? super T> predicate1, Predicate<? super T> predicate2) {
+    public OrPredicate(final Predicate<? super T> predicate1, final Predicate<? super T> predicate2) {
         super();
         iPredicate1 = predicate1;
         iPredicate2 = predicate2;
@@ -71,7 +71,7 @@ public final class OrPredicate<T> implem
      * @param object  the input object
      * @return true if either decorated predicate returns true
      */
-    public boolean evaluate(T object) {
+    public boolean evaluate(final T object) {
        return iPredicate1.evaluate(object) || iPredicate2.evaluate(object);
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java Mon Jan  7 17:15:14 2013
@@ -43,7 +43,7 @@ public class PredicateTransformer<T> imp
      * @return the <code>predicate</code> transformer
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Transformer<T, Boolean> predicateTransformer(Predicate<? super T> predicate) {
+    public static <T> Transformer<T, Boolean> predicateTransformer(final Predicate<? super T> predicate) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
@@ -56,7 +56,7 @@ public class PredicateTransformer<T> imp
      * 
      * @param predicate  the predicate to call, not null
      */
-    public PredicateTransformer(Predicate<? super T> predicate) {
+    public PredicateTransformer(final Predicate<? super T> predicate) {
         super();
         iPredicate = predicate;
     }
@@ -67,7 +67,7 @@ public class PredicateTransformer<T> imp
      * @param input  the input object to transform
      * @return the transformed result
      */
-    public Boolean transform(T input) {
+    public Boolean transform(final T input) {
         return Boolean.valueOf(iPredicate.evaluate(input));
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java Mon Jan  7 17:15:14 2013
@@ -54,22 +54,22 @@ public class PrototypeFactory {
      * @throws IllegalArgumentException if the prototype cannot be cloned
      */
     @SuppressWarnings("unchecked")
-    public static <T> Factory<T> prototypeFactory(T prototype) {
+    public static <T> Factory<T> prototypeFactory(final T prototype) {
         if (prototype == null) {
             return ConstantFactory.<T>constantFactory(null);
         }
         try {
-            Method method = prototype.getClass().getMethod("clone", (Class[]) null);
+            final Method method = prototype.getClass().getMethod("clone", (Class[]) null);
             return new PrototypeCloneFactory<T>(prototype, method);
 
-        } catch (NoSuchMethodException ex) {
+        } catch (final NoSuchMethodException ex) {
             try {
                 prototype.getClass().getConstructor(new Class<?>[] { prototype.getClass() });
                 return new InstantiateFactory<T>(
                     (Class<T>) prototype.getClass(),
                     new Class<?>[] { prototype.getClass() },
                     new Object[] { prototype });
-            } catch (NoSuchMethodException ex2) {
+            } catch (final NoSuchMethodException ex2) {
                 if (prototype instanceof Serializable) {
                     return (Factory<T>) new PrototypeSerializationFactory<Serializable>((Serializable) prototype);
                 }
@@ -104,7 +104,7 @@ public class PrototypeFactory {
         /**
          * Constructor to store prototype.
          */
-        private PrototypeCloneFactory(T prototype, Method method) {
+        private PrototypeCloneFactory(final T prototype, final Method method) {
             super();
             iPrototype = prototype;
             iCloneMethod = method;
@@ -116,7 +116,7 @@ public class PrototypeFactory {
         private void findCloneMethod() {
             try {
                 iCloneMethod = iPrototype.getClass().getMethod("clone", (Class[]) null);
-            } catch (NoSuchMethodException ex) {
+            } catch (final NoSuchMethodException ex) {
                 throw new IllegalArgumentException("PrototypeCloneFactory: The clone method must exist and be public ");
             }
         }
@@ -135,9 +135,9 @@ public class PrototypeFactory {
 
             try {
                 return (T) iCloneMethod.invoke(iPrototype, (Object[]) null);
-            } catch (IllegalAccessException ex) {
+            } catch (final IllegalAccessException ex) {
                 throw new FunctorException("PrototypeCloneFactory: Clone method must be public", ex);
-            } catch (InvocationTargetException ex) {
+            } catch (final InvocationTargetException ex) {
                 throw new FunctorException("PrototypeCloneFactory: Clone method threw an exception", ex);
             }
         }
@@ -159,7 +159,7 @@ public class PrototypeFactory {
         /**
          * Constructor to store prototype
          */
-        private PrototypeSerializationFactory(T prototype) {
+        private PrototypeSerializationFactory(final T prototype) {
             super();
             iPrototype = prototype;
         }
@@ -171,31 +171,31 @@ public class PrototypeFactory {
          */
         @SuppressWarnings("unchecked")
         public T create() {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
+            final ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
             ByteArrayInputStream bais = null;
             try {
-                ObjectOutputStream out = new ObjectOutputStream(baos);
+                final ObjectOutputStream out = new ObjectOutputStream(baos);
                 out.writeObject(iPrototype);
 
                 bais = new ByteArrayInputStream(baos.toByteArray());
-                ObjectInputStream in = new ObjectInputStream(bais);
+                final ObjectInputStream in = new ObjectInputStream(bais);
                 return (T) in.readObject();
 
-            } catch (ClassNotFoundException ex) {
+            } catch (final ClassNotFoundException ex) {
                 throw new FunctorException(ex);
-            } catch (IOException ex) {
+            } catch (final IOException ex) {
                 throw new FunctorException(ex);
             } finally {
                 try {
                     if (bais != null) {
                         bais.close();
                     }
-                } catch (IOException ex) {
+                } catch (final IOException ex) {
                     // ignore
                 }
                 try {
                     baos.close();
-                } catch (IOException ex) {
+                } catch (final IOException ex) {
                     // ignore
                 }
             }

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java Mon Jan  7 17:15:14 2013
@@ -59,7 +59,7 @@ public final class StringValueTransforme
      * @param input  the input object to transform
      * @return the transformed result
      */
-    public String transform(T input) {
+    public String transform(final T input) {
         return String.valueOf(input);
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java Mon Jan  7 17:15:14 2013
@@ -53,9 +53,9 @@ public class SwitchClosure<E> implements
      * @throws IllegalArgumentException if any element in the array is null
      */
     @SuppressWarnings("unchecked")
-    public static <E> Closure<E> switchClosure(Predicate<? super E>[] predicates,
-                                               Closure<? super E>[] closures,
-                                               Closure<? super E> defaultClosure) {
+    public static <E> Closure<E> switchClosure(final Predicate<? super E>[] predicates,
+                                               final Closure<? super E>[] closures,
+                                               final Closure<? super E> defaultClosure) {
         FunctorUtils.validate(predicates);
         FunctorUtils.validate(closures);
         if (predicates.length != closures.length) {
@@ -86,20 +86,20 @@ public class SwitchClosure<E> implements
      * @throws ClassCastException  if the map elements are of the wrong type
      */
     @SuppressWarnings("unchecked")
-    public static <E> Closure<E> switchClosure(Map<Predicate<E>, Closure<E>> predicatesAndClosures) {
+    public static <E> Closure<E> switchClosure(final Map<Predicate<E>, Closure<E>> predicatesAndClosures) {
         if (predicatesAndClosures == null) {
             throw new IllegalArgumentException("The predicate and closure map must not be null");
         }
         // convert to array like this to guarantee iterator() ordering
-        Closure<? super E> defaultClosure = predicatesAndClosures.remove(null);
-        int size = predicatesAndClosures.size();
+        final Closure<? super E> defaultClosure = predicatesAndClosures.remove(null);
+        final int size = predicatesAndClosures.size();
         if (size == 0) {
             return (Closure<E>) (defaultClosure == null ? NOPClosure.<E>nopClosure() : defaultClosure);
         }
-        Closure<E>[] closures = new Closure[size];
-        Predicate<E>[] preds = new Predicate[size];
+        final Closure<E>[] closures = new Closure[size];
+        final Predicate<E>[] preds = new Predicate[size];
         int i = 0;
-        for (Map.Entry<Predicate<E>, Closure<E>> entry : predicatesAndClosures.entrySet()) {
+        for (final Map.Entry<Predicate<E>, Closure<E>> entry : predicatesAndClosures.entrySet()) {
             preds[i] = entry.getKey();
             closures[i] = entry.getValue();
             i++;
@@ -116,8 +116,8 @@ public class SwitchClosure<E> implements
      * @param defaultClosure  the closure to use if no match, null means nop
      */
     @SuppressWarnings("unchecked")
-    public SwitchClosure(Predicate<? super E>[] predicates, Closure<? super E>[] closures,
-                         Closure<? super E> defaultClosure) {
+    public SwitchClosure(final Predicate<? super E>[] predicates, final Closure<? super E>[] closures,
+                         final Closure<? super E> defaultClosure) {
         super();
         iPredicates = predicates;
         iClosures = closures;
@@ -129,7 +129,7 @@ public class SwitchClosure<E> implements
      *
      * @param input  the input object
      */
-    public void execute(E input) {
+    public void execute(final E input) {
         for (int i = 0; i < iPredicates.length; i++) {
             if (iPredicates[i].evaluate(input) == true) {
                 iClosures[i].execute(input);

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java Mon Jan  7 17:15:14 2013
@@ -52,9 +52,9 @@ public class SwitchTransformer<I, O> imp
      * @throws IllegalArgumentException if any element in the array is null
      */
     @SuppressWarnings("unchecked")
-    public static <I, O> Transformer<I, O> switchTransformer(Predicate<? super I>[] predicates,
-            Transformer<? super I, ? extends O>[] transformers,
-            Transformer<? super I, ? extends O> defaultTransformer) {
+    public static <I, O> Transformer<I, O> switchTransformer(final Predicate<? super I>[] predicates,
+            final Transformer<? super I, ? extends O>[] transformers,
+            final Transformer<? super I, ? extends O> defaultTransformer) {
         FunctorUtils.validate(predicates);
         FunctorUtils.validate(transformers);
         if (predicates.length != transformers.length) {
@@ -87,7 +87,7 @@ public class SwitchTransformer<I, O> imp
      */
     @SuppressWarnings("unchecked")
     public static <I, O> Transformer<I, O> switchTransformer(
-            Map<? extends Predicate<? super I>, ? extends Transformer<? super I, ? extends O>> predicatesAndTransformers) {
+            final Map<? extends Predicate<? super I>, ? extends Transformer<? super I, ? extends O>> predicatesAndTransformers) {
         if (predicatesAndTransformers == null) {
             throw new IllegalArgumentException("The predicate and transformer map must not be null");
         }
@@ -95,15 +95,15 @@ public class SwitchTransformer<I, O> imp
             return ConstantTransformer.<I, O>nullTransformer();
         }
         // convert to array like this to guarantee iterator() ordering
-        Transformer<? super I, ? extends O> defaultTransformer = predicatesAndTransformers.remove(null);
-        int size = predicatesAndTransformers.size();
+        final Transformer<? super I, ? extends O> defaultTransformer = predicatesAndTransformers.remove(null);
+        final int size = predicatesAndTransformers.size();
         if (size == 0) {
             return (Transformer<I, O>) (defaultTransformer == null ? ConstantTransformer.<I, O>nullTransformer() : defaultTransformer);
         }
-        Transformer<? super I, ? extends O>[] transformers = new Transformer[size];
-        Predicate<? super I>[] preds = new Predicate[size];
+        final Transformer<? super I, ? extends O>[] transformers = new Transformer[size];
+        final Predicate<? super I>[] preds = new Predicate[size];
         int i = 0;
-        for (Map.Entry<? extends Predicate<? super I>, ? extends Transformer<? super I, ? extends O>> entry : predicatesAndTransformers.entrySet()) {
+        for (final Map.Entry<? extends Predicate<? super I>, ? extends Transformer<? super I, ? extends O>> entry : predicatesAndTransformers.entrySet()) {
             preds[i] = entry.getKey();
             transformers[i] = entry.getValue();
             i++;
@@ -120,9 +120,9 @@ public class SwitchTransformer<I, O> imp
      * @param defaultTransformer  the transformer to use if no match, null means return null
      */
     @SuppressWarnings("unchecked")
-    public SwitchTransformer(Predicate<? super I>[] predicates,
-            Transformer<? super I, ? extends O>[] transformers,
-            Transformer<? super I, ? extends O> defaultTransformer) {
+    public SwitchTransformer(final Predicate<? super I>[] predicates,
+            final Transformer<? super I, ? extends O>[] transformers,
+            final Transformer<? super I, ? extends O> defaultTransformer) {
         super();
         iPredicates = predicates;
         iTransformers = transformers;
@@ -136,7 +136,7 @@ public class SwitchTransformer<I, O> imp
      * @param input  the input object to transform
      * @return the transformed result
      */
-    public O transform(I input) {
+    public O transform(final I input) {
         for (int i = 0; i < iPredicates.length; i++) {
             if (iPredicates[i].evaluate(input) == true) {
                 return iTransformers[i].transform(input);

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java Mon Jan  7 17:15:14 2013
@@ -48,8 +48,8 @@ public final class TransformedPredicate<
      * @return the predicate
      * @throws IllegalArgumentException if the transformer or the predicate is null
      */
-    public static <T> Predicate<T> transformedPredicate(Transformer<? super T, ? extends T> transformer,
-                                                        Predicate<? super T> predicate) {
+    public static <T> Predicate<T> transformedPredicate(final Transformer<? super T, ? extends T> transformer,
+                                                        final Predicate<? super T> predicate) {
         if (transformer == null) {
             throw new IllegalArgumentException("The transformer to call must not be null");
         }
@@ -66,7 +66,7 @@ public final class TransformedPredicate<
      * @param transformer  the transformer to use
      * @param predicate  the predicate to decorate
      */
-    public TransformedPredicate(Transformer<? super T, ? extends T> transformer, Predicate<? super T> predicate) {
+    public TransformedPredicate(final Transformer<? super T, ? extends T> transformer, final Predicate<? super T> predicate) {
         iTransformer = transformer;
         iPredicate = predicate;
     }
@@ -78,8 +78,8 @@ public final class TransformedPredicate<
      * @param object  the input object which will be transformed
      * @return true if decorated predicate returns true
      */
-    public boolean evaluate(T object) {
-        T result = iTransformer.transform(object);
+    public boolean evaluate(final T object) {
+        final T result = iTransformer.transform(object);
         return iPredicate.evaluate(result);
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java Mon Jan  7 17:15:14 2013
@@ -45,7 +45,7 @@ public class TransformerClosure<E> imple
      * @param transformer  the transformer to call, null means nop
      * @return the <code>transformer</code> closure
      */
-    public static <E> Closure<E> transformerClosure(Transformer<? super E, ?> transformer) {
+    public static <E> Closure<E> transformerClosure(final Transformer<? super E, ?> transformer) {
         if (transformer == null) {
             return NOPClosure.<E>nopClosure();
         }
@@ -58,7 +58,7 @@ public class TransformerClosure<E> imple
      * 
      * @param transformer  the transformer to call, not null
      */
-    public TransformerClosure(Transformer<? super E, ?> transformer) {
+    public TransformerClosure(final Transformer<? super E, ?> transformer) {
         super();
         iTransformer = transformer;
     }
@@ -68,7 +68,7 @@ public class TransformerClosure<E> imple
      * 
      * @param input  the input object
      */
-    public void execute(E input) {
+    public void execute(final E input) {
         iTransformer.transform(input);
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java Mon Jan  7 17:15:14 2013
@@ -44,7 +44,7 @@ public final class TransformerPredicate<
      * @return the predicate
      * @throws IllegalArgumentException if the transformer is null
      */
-    public static <T> Predicate<T> transformerPredicate(Transformer<? super T, Boolean> transformer) {
+    public static <T> Predicate<T> transformerPredicate(final Transformer<? super T, Boolean> transformer) {
         if (transformer == null) {
             throw new IllegalArgumentException("The transformer to call must not be null");
         }
@@ -57,7 +57,7 @@ public final class TransformerPredicate<
      *
      * @param transformer  the transformer to decorate
      */
-    public TransformerPredicate(Transformer<? super T, Boolean> transformer) {
+    public TransformerPredicate(final Transformer<? super T, Boolean> transformer) {
         super();
         iTransformer = transformer;
     }
@@ -69,8 +69,8 @@ public final class TransformerPredicate<
      * @return true if decorated transformer returns Boolean.TRUE
      * @throws FunctorException if the transformer returns an invalid type
      */
-    public boolean evaluate(T object) {
-        Boolean result = iTransformer.transform(object);
+    public boolean evaluate(final T object) {
+        final Boolean result = iTransformer.transform(object);
         if (result == null) {
             throw new FunctorException(
                     "Transformer must return an instanceof Boolean, it was a null object");

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TruePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TruePredicate.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TruePredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TruePredicate.java Mon Jan  7 17:15:14 2013
@@ -59,7 +59,7 @@ public final class TruePredicate<T> impl
      * @param object  the input object
      * @return true always
      */
-    public boolean evaluate(T object) {
+    public boolean evaluate(final T object) {
         return true;
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java Mon Jan  7 17:15:14 2013
@@ -63,7 +63,7 @@ public final class UniquePredicate<T> im
      * @param object  the input object
      * @return true if this is the first time the object is seen
      */
-    public boolean evaluate(T object) {
+    public boolean evaluate(final T object) {
         return iSet.add(object);
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/WhileClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/WhileClosure.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/WhileClosure.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/WhileClosure.java Mon Jan  7 17:15:14 2013
@@ -50,8 +50,8 @@ public class WhileClosure<E> implements 
      * @return the <code>while</code> closure
      * @throws IllegalArgumentException if the predicate or closure is null
      */
-    public static <E> Closure<E> whileClosure(Predicate<? super E> predicate,
-                                              Closure<? super E> closure, boolean doLoop) {
+    public static <E> Closure<E> whileClosure(final Predicate<? super E> predicate,
+                                              final Closure<? super E> closure, final boolean doLoop) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
@@ -69,7 +69,7 @@ public class WhileClosure<E> implements 
      * @param closure  the closure the execute, not null
      * @param doLoop  true to act as a do-while loop, always executing the closure once
      */
-    public WhileClosure(Predicate<? super E> predicate, Closure<? super E> closure, boolean doLoop) {
+    public WhileClosure(final Predicate<? super E> predicate, final Closure<? super E> closure, final boolean doLoop) {
         super();
         iPredicate = predicate;
         iClosure = closure;
@@ -81,7 +81,7 @@ public class WhileClosure<E> implements 
      * 
      * @param input  the input object
      */
-    public void execute(E input) {
+    public void execute(final E input) {
         if (iDoLoop) {
             iClosure.execute(input);
         }

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java Mon Jan  7 17:15:14 2013
@@ -57,11 +57,11 @@ abstract class AbstractEmptyIterator<E> 
         return -1;
     }
 
-    public void add(E obj) {
+    public void add(final E obj) {
         throw new UnsupportedOperationException("add() not supported for empty Iterator");
     }
 
-    public void set(E obj) {
+    public void set(final E obj) {
         throw new IllegalStateException("Iterator contains no elements");
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyMapIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyMapIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyMapIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyMapIterator.java Mon Jan  7 17:15:14 2013
@@ -39,7 +39,7 @@ public abstract class AbstractEmptyMapIt
         throw new IllegalStateException("Iterator contains no elements");
     }
 
-    public V setValue(V value) {
+    public V setValue(final V value) {
         throw new IllegalStateException("Iterator contains no elements");
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java Mon Jan  7 17:15:14 2013
@@ -35,7 +35,7 @@ public abstract class AbstractIteratorDe
      * @param iterator  the iterator to decorate, must not be null
      * @throws IllegalArgumentException if the collection is null
      */
-    protected AbstractIteratorDecorator(Iterator<E> iterator) {
+    protected AbstractIteratorDecorator(final Iterator<E> iterator) {
         super(iterator);
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java Mon Jan  7 17:15:14 2013
@@ -38,7 +38,7 @@ public class AbstractListIteratorDecorat
      * @param iterator  the iterator to decorate, must not be null
      * @throws IllegalArgumentException if the collection is null
      */
-    public AbstractListIteratorDecorator(ListIterator<E> iterator) {
+    public AbstractListIteratorDecorator(final ListIterator<E> iterator) {
         super();
         if (iterator == null) {
             throw new IllegalArgumentException("ListIterator must not be null");
@@ -93,12 +93,12 @@ public class AbstractListIteratorDecorat
     }
 
     /** {@inheritDoc} */
-    public void set(E obj) {
+    public void set(final E obj) {
         iterator.set(obj);
     }
 
     /** {@inheritDoc} */
-    public void add(E obj) {
+    public void add(final E obj) {
         iterator.add(obj);
     }
     

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java Mon Jan  7 17:15:14 2013
@@ -38,7 +38,7 @@ public class AbstractMapIteratorDecorato
      * @param iterator  the iterator to decorate, must not be null
      * @throws IllegalArgumentException if the collection is null
      */
-    public AbstractMapIteratorDecorator(MapIterator<K, V> iterator) {
+    public AbstractMapIteratorDecorator(final MapIterator<K, V> iterator) {
         super();
         if (iterator == null) {
             throw new IllegalArgumentException("MapIterator must not be null");
@@ -83,7 +83,7 @@ public class AbstractMapIteratorDecorato
     }
 
     /** {@inheritDoc} */
-    public V setValue(V obj) {
+    public V setValue(final V obj) {
         return iterator.setValue(obj);
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java Mon Jan  7 17:15:14 2013
@@ -38,7 +38,7 @@ public class AbstractOrderedMapIteratorD
      * @param iterator  the iterator to decorate, must not be null
      * @throws IllegalArgumentException if the collection is null
      */
-    public AbstractOrderedMapIteratorDecorator(OrderedMapIterator<K, V> iterator) {
+    public AbstractOrderedMapIteratorDecorator(final OrderedMapIterator<K, V> iterator) {
         super();
         if (iterator == null) {
             throw new IllegalArgumentException("OrderedMapIterator must not be null");
@@ -93,7 +93,7 @@ public class AbstractOrderedMapIteratorD
     }
 
     /** {@inheritDoc} */
-    public V setValue(V obj) {
+    public V setValue(final V obj) {
         return iterator.setValue(obj);
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractUntypedIteratorDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractUntypedIteratorDecorator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractUntypedIteratorDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/AbstractUntypedIteratorDecorator.java Mon Jan  7 17:15:14 2013
@@ -37,7 +37,7 @@ public abstract class AbstractUntypedIte
      * 
      * @param iterator  the iterator to decorate
      */
-    protected AbstractUntypedIteratorDecorator(Iterator<I> iterator) {
+    protected AbstractUntypedIteratorDecorator(final Iterator<I> iterator) {
         super();
         if (iterator == null) {
             throw new IllegalArgumentException("Iterator must not be null");

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java Mon Jan  7 17:15:14 2013
@@ -72,7 +72,7 @@ public class ArrayListIterator<E> extend
      * @throws IllegalArgumentException if <code>array</code> is not an array.
      * @throws NullPointerException if <code>array</code> is <code>null</code>
      */
-    public ArrayListIterator(Object array) {
+    public ArrayListIterator(final Object array) {
         super(array);
     }
 
@@ -86,7 +86,7 @@ public class ArrayListIterator<E> extend
      * @throws NullPointerException if <code>array</code> is <code>null</code>
      * @throws IndexOutOfBoundsException if the start index is out of bounds
      */
-    public ArrayListIterator(Object array, int startIndex) {
+    public ArrayListIterator(final Object array, final int startIndex) {
         super(array, startIndex);
         this.startIndex = startIndex;
     }
@@ -103,7 +103,7 @@ public class ArrayListIterator<E> extend
      * @throws IllegalArgumentException if end index is before the start
      * @throws NullPointerException if <code>array</code> is <code>null</code>
      */
-    public ArrayListIterator(Object array, int startIndex, int endIndex) {
+    public ArrayListIterator(final Object array, final int startIndex, final int endIndex) {
         super(array, startIndex, endIndex);
         this.startIndex = startIndex;
     }
@@ -176,7 +176,7 @@ public class ArrayListIterator<E> extend
      * @throws UnsupportedOperationException always thrown.
      * @see java.util.ListIterator#set
      */
-    public void add(Object o) {
+    public void add(final Object o) {
         throw new UnsupportedOperationException("add() method is not supported");
     }
 
@@ -198,7 +198,7 @@ public class ArrayListIterator<E> extend
      * before {@link #set(Object)}
      * @see java.util.ListIterator#set
      */
-    public void set(Object o) {
+    public void set(final Object o) {
         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/CollatingIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java Mon Jan  7 17:15:14 2013
@@ -133,7 +133,7 @@ public class CollatingIterator<E> implem
      */
     public CollatingIterator(final Comparator<? super E> comp, final Iterator<? extends E>[] iterators) {
         this(comp, iterators.length);
-        for (Iterator<? extends E> iterator : iterators) {
+        for (final Iterator<? extends E> iterator : iterators) {
             addIterator(iterator);
         }
     }
@@ -154,7 +154,7 @@ public class CollatingIterator<E> implem
      */
     public CollatingIterator(final Comparator<? super E> comp, final Collection<Iterator<? extends E>> iterators) {
         this(comp, iterators.size());
-        for (Iterator<? extends E> iterator : iterators) {
+        for (final Iterator<? extends E> iterator : iterators) {
             addIterator(iterator);
         }
     }
@@ -248,11 +248,11 @@ public class CollatingIterator<E> implem
         if (hasNext() == false) {
             throw new NoSuchElementException();
         }
-        int leastIndex = least();
+        final int leastIndex = least();
         if (leastIndex == -1) {
             throw new NoSuchElementException();
         }
-        E val = values.get(leastIndex);
+        final E val = values.get(leastIndex);
         clear(leastIndex);
         lastReturned = leastIndex;
         return val;
@@ -310,8 +310,8 @@ public class CollatingIterator<E> implem
      * 
      * @return <tt>false</tt> iff there was no value to set
      */
-    private boolean set(int i) {
-        Iterator<? extends E> it = iterators.get(i);
+    private boolean set(final int i) {
+        final Iterator<? extends E> it = iterators.get(i);
         if (it.hasNext()) {
             values.set(i, it.next());
             valueSet.set(i);
@@ -326,7 +326,7 @@ public class CollatingIterator<E> implem
      * Clears the {@link #values} and {@link #valueSet} attributes at position
      * <i>i</i>.
      */
-    private void clear(int i) {
+    private void clear(final int i) {
         values.set(i, null);
         valueSet.clear(i);
     }
@@ -361,7 +361,7 @@ public class CollatingIterator<E> implem
                     leastIndex = i;
                     leastObject = values.get(i);
                 } else {
-                    E curObject = values.get(i);
+                    final E curObject = values.get(i);
                     if (comparator == null) {
                         throw new NullPointerException("You must invoke setComparator() to set a comparator first.");
                     }
@@ -379,7 +379,7 @@ public class CollatingIterator<E> implem
      * Returns <code>true</code> iff any bit in the given set is
      * <code>true</code>.
      */
-    private boolean anyValueSet(BitSet set) {
+    private boolean anyValueSet(final BitSet set) {
         for (int i = 0; i < set.size(); i++) {
             if (set.get(i)) {
                 return true;
@@ -392,8 +392,8 @@ public class CollatingIterator<E> implem
      * Returns <code>true</code> iff any {@link Iterator} in the given list has
      * a next value.
      */
-    private boolean anyHasNext(ArrayList<Iterator<? extends E>> iters) {
-        for (Iterator<? extends E> iterator : iters) {
+    private boolean anyHasNext(final ArrayList<Iterator<? extends E>> iters) {
+        for (final Iterator<? extends E> iterator : iters) {
             if (iterator.hasNext()) {
                 return true;
             }

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java Mon Jan  7 17:15:14 2013
@@ -49,7 +49,7 @@ public class EntrySetMapIterator<K, V> i
      * 
      * @param map  the map to iterate over
      */
-    public EntrySetMapIterator(Map<K, V> map) {
+    public EntrySetMapIterator(final Map<K, V> map) {
         super();
         this.map = map;
         this.iterator = map.entrySet().iterator();
@@ -136,7 +136,7 @@ public class EntrySetMapIterator<K, V> i
      * @throws IllegalStateException if <code>remove()</code> has been called since the
      *  last call to <code>next()</code>
      */
-    public V setValue(V value) {
+    public V setValue(final V value) {
         if (last == null) {
             throw new IllegalStateException("Iterator setValue() can only be called after next() and before remove()");
         }

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java?rev=1429905&r1=1429904&r2=1429905&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java Mon Jan  7 17:15:14 2013
@@ -56,7 +56,7 @@ public class FilterIterator<E> implement
      *
      * @param iterator  the iterator to use
      */
-    public FilterIterator(Iterator<? extends E> iterator) {
+    public FilterIterator(final Iterator<? extends E> iterator) {
         super();
         this.iterator = iterator;
     }
@@ -68,7 +68,7 @@ public class FilterIterator<E> implement
      * @param iterator  the iterator to use
      * @param predicate  the predicate to use
      */
-    public FilterIterator(Iterator<? extends E> iterator, Predicate<? super E> predicate) {
+    public FilterIterator(final Iterator<? extends E> iterator, final Predicate<? super E> predicate) {
         super();
         this.iterator = iterator;
         this.predicate = predicate;
@@ -138,7 +138,7 @@ public class FilterIterator<E> implement
      *
      * @param iterator  the iterator to use
      */
-    public void setIterator(Iterator<? extends E> iterator) {
+    public void setIterator(final Iterator<? extends E> iterator) {
         this.iterator = iterator;
         nextObject = null;
         nextObjectSet = false;
@@ -159,7 +159,7 @@ public class FilterIterator<E> implement
      *
      * @param predicate  the predicate to use
      */
-    public void setPredicate(Predicate<? super E> predicate) {
+    public void setPredicate(final Predicate<? super E> predicate) {
         this.predicate = predicate;
         nextObject = null;
         nextObjectSet = false;
@@ -172,7 +172,7 @@ public class FilterIterator<E> implement
      */
     private boolean setNextObject() {
         while (iterator.hasNext()) {
-            E object = iterator.next();
+            final E object = iterator.next();
             if (predicate.evaluate(object)) {
                 nextObject = object;
                 nextObjectSet = true;



Mime
View raw message