From 87d923f0d72c5e81105e6a1f8958e7800b79ef07 Mon Sep 17 00:00:00 2001
From: Thomas Neidhart <tn@apache.org>
Date: Sat, 23 Jun 2012 12:46:05 +0000
Subject: [PATCH] [COLLECTIONS-414] Fix type inference problems.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1353123 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/commons/collections/functors/ChainedClosure.java | 3 +--
 .../commons/collections/functors/ChainedTransformer.java    | 3 +--
 .../apache/commons/collections/functors/NonePredicate.java  | 3 +--
 .../apache/commons/collections/functors/OnePredicate.java   | 3 +--
 .../apache/commons/collections/functors/SwitchClosure.java  | 4 +---
 .../commons/collections/functors/SwitchTransformer.java     | 6 +++---
 6 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java b/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java
index 063ac253c..ec43ee897 100644
--- a/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java
+++ b/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java
@@ -50,8 +50,7 @@ public class ChainedClosure<E> implements Closure<E>, Serializable {
         if (closures.length == 0) {
             return NOPClosure.<E>nopClosure();
         }
-        closures = FunctorUtils.copy(closures);
-        return new ChainedClosure<E>(closures);
+        return new ChainedClosure<E>(FunctorUtils.copy(closures));
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java b/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java
index 541ef41b9..40e111909 100644
--- a/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java
+++ b/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java
@@ -53,8 +53,7 @@ public class ChainedTransformer<T> implements Transformer<T, T>, Serializable {
         if (transformers.length == 0) {
             return NOPTransformer.<T>nopTransformer();
         }
-        transformers = FunctorUtils.copy(transformers);
-        return new ChainedTransformer<T>(transformers);
+        return new ChainedTransformer<T>(FunctorUtils.copy(transformers));
     }
     
     /**
diff --git a/src/main/java/org/apache/commons/collections/functors/NonePredicate.java b/src/main/java/org/apache/commons/collections/functors/NonePredicate.java
index b240ebab4..d2065bbd9 100644
--- a/src/main/java/org/apache/commons/collections/functors/NonePredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/NonePredicate.java
@@ -58,8 +58,7 @@ public final class NonePredicate<T> implements Predicate<T>, PredicateDecorator<
         if (predicates.length == 0) {
             return TruePredicate.<T>truePredicate();
         }
-        predicates = FunctorUtils.copy(predicates);
-        return new NonePredicate<T>(predicates);
+        return new NonePredicate<T>(FunctorUtils.copy(predicates));
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections/functors/OnePredicate.java b/src/main/java/org/apache/commons/collections/functors/OnePredicate.java
index 28d90b9b7..5c5645405 100644
--- a/src/main/java/org/apache/commons/collections/functors/OnePredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/OnePredicate.java
@@ -63,8 +63,7 @@ public final class OnePredicate<T> implements Predicate<T>, PredicateDecorator<T
         if (predicates.length == 1) {
             return (Predicate<T>) predicates[0];
         }
-        predicates = FunctorUtils.copy(predicates);
-        return new OnePredicate<T>(predicates);
+        return new OnePredicate<T>(FunctorUtils.copy(predicates));
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java b/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java
index f01f67cd6..6b7d6df18 100644
--- a/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java
+++ b/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java
@@ -63,9 +63,7 @@ public class SwitchClosure<E> implements Closure<E>, Serializable {
         if (predicates.length == 0) {
             return (Closure<E>) (defaultClosure == null ? NOPClosure.<E>nopClosure(): defaultClosure);
         }
-        predicates = FunctorUtils.copy(predicates);
-        closures = FunctorUtils.copy(closures);
-        return new SwitchClosure<E>(predicates, closures, defaultClosure);
+        return new SwitchClosure<E>(FunctorUtils.copy(predicates), FunctorUtils.copy(closures), defaultClosure);
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java b/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java
index e4548e868..37031f672 100644
--- a/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java
+++ b/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java
@@ -65,9 +65,9 @@ public class SwitchTransformer<I, O> implements Transformer<I, O>, Serializable
         if (predicates.length == 0) {
             return (Transformer<I, O>) (defaultTransformer == null ? ConstantTransformer.<I, O>nullTransformer() : defaultTransformer);
         }
-        predicates = FunctorUtils.copy(predicates);
-        transformers = FunctorUtils.copy(transformers);
-        return new SwitchTransformer<I, O>(predicates, transformers, defaultTransformer);
+        return new SwitchTransformer<I, O>(FunctorUtils.copy(predicates),
+                                           FunctorUtils.copy(transformers),
+                                           defaultTransformer);
     }
 
     /**