From cca574ea06ca9bc364df1f04cda71ef9854bb417 Mon Sep 17 00:00:00 2001
From: Thomas Neidhart <tn@apache.org>
Date: Sat, 27 Apr 2013 14:13:54 +0000
Subject: [PATCH] Replace references to getInstance with the corresponding
 factory method name.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1476582 13f79535-47bb-0310-9956-ffa450edef68
---
 .../collections4/functors/AbstractQuantifierPredicate.java  | 1 -
 .../apache/commons/collections4/functors/AllPredicate.java  | 2 +-
 .../apache/commons/collections4/functors/AndPredicate.java  | 2 +-
 .../apache/commons/collections4/functors/AnyPredicate.java  | 2 +-
 .../commons/collections4/functors/ChainedClosure.java       | 2 +-
 .../commons/collections4/functors/ChainedTransformer.java   | 2 +-
 .../commons/collections4/functors/CloneTransformer.java     | 4 ++--
 .../commons/collections4/functors/ClosureTransformer.java   | 2 +-
 .../commons/collections4/functors/ComparatorPredicate.java  | 6 +++---
 .../commons/collections4/functors/ConstantFactory.java      | 2 +-
 .../commons/collections4/functors/ConstantTransformer.java  | 2 +-
 .../commons/collections4/functors/EqualPredicate.java       | 4 ++--
 .../commons/collections4/functors/FactoryTransformer.java   | 2 +-
 .../apache/commons/collections4/functors/ForClosure.java    | 2 +-
 .../commons/collections4/functors/IdentityPredicate.java    | 2 +-
 .../org/apache/commons/collections4/functors/IfClosure.java | 4 ++--
 .../commons/collections4/functors/InstanceofPredicate.java  | 2 +-
 .../commons/collections4/functors/InstantiateFactory.java   | 4 ++--
 .../collections4/functors/InstantiateTransformer.java       | 2 +-
 .../commons/collections4/functors/InvokerTransformer.java   | 2 +-
 .../commons/collections4/functors/MapTransformer.java       | 2 +-
 .../apache/commons/collections4/functors/NOPClosure.java    | 2 +-
 .../commons/collections4/functors/NOPTransformer.java       | 2 +-
 .../apache/commons/collections4/functors/NonePredicate.java | 2 +-
 .../apache/commons/collections4/functors/NotPredicate.java  | 2 +-
 .../collections4/functors/NullIsExceptionPredicate.java     | 2 +-
 .../commons/collections4/functors/NullIsFalsePredicate.java | 2 +-
 .../commons/collections4/functors/NullIsTruePredicate.java  | 2 +-
 .../apache/commons/collections4/functors/OnePredicate.java  | 2 +-
 .../apache/commons/collections4/functors/OrPredicate.java   | 2 +-
 .../commons/collections4/functors/PredicateTransformer.java | 2 +-
 .../commons/collections4/functors/PrototypeFactory.java     | 3 +--
 .../apache/commons/collections4/functors/SwitchClosure.java | 2 +-
 .../commons/collections4/functors/SwitchTransformer.java    | 2 +-
 .../commons/collections4/functors/TransformedPredicate.java | 2 +-
 .../commons/collections4/functors/TransformerClosure.java   | 2 +-
 .../commons/collections4/functors/TransformerPredicate.java | 2 +-
 .../commons/collections4/functors/UniquePredicate.java      | 2 +-
 .../apache/commons/collections4/functors/WhileClosure.java  | 2 +-
 39 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
index 3d840a43b..3cbee63ce 100644
--- a/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
@@ -36,7 +36,6 @@ public abstract class AbstractQuantifierPredicate<T> implements Predicate<T>, Pr
     
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
      *
      * @param predicates  the predicates to check, not cloned, not null
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java
index 6620bee61..211b16336 100644
--- a/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java
@@ -90,7 +90,7 @@ public final class AllPredicate<T> extends AbstractQuantifierPredicate<T> implem
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>allPredicate</code> if you want that.
      *
      * @param predicates  the predicates to check, not cloned, not null
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java
index 702a7eaae..a3c72f825 100644
--- a/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java
@@ -55,7 +55,7 @@ public final class AndPredicate<T> implements Predicate<T>, PredicateDecorator<T
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>andPredicate</code> if you want that.
      *
      * @param predicate1  the first predicate to check, not null
      * @param predicate2  the second predicate to check, not null
diff --git a/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java
index 8520d4733..b57a0c574 100644
--- a/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java
@@ -87,7 +87,7 @@ public final class AnyPredicate<T> extends AbstractQuantifierPredicate<T> implem
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>anyPredicate</code> if you want that.
      *
      * @param predicates  the predicates to check, not cloned, not null
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java b/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java
index a349e7f4e..b905c0c6c 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java
@@ -83,7 +83,7 @@ public class ChainedClosure<E> implements Closure<E>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>chainedClosure</code> if you want that.
      * 
      * @param closures  the closures to chain, not copied, no nulls
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
index 53b1b6807..d6f6270b9 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
@@ -82,7 +82,7 @@ public class ChainedTransformer<T> implements Transformer<T, T>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>chainedTransformer</code> if you want that.
      * 
      * @param transformers  the transformers to chain, not copied, no nulls
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java b/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java
index 66a071841..d065eacaa 100644
--- a/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections4.Transformer;
 /**
  * Transformer implementation that returns a clone of the input object.
  * <p>
- * Clone is performed using <code>PrototypeFactory.getInstance(input).create()</code>.
+ * Clone is performed using <code>PrototypeFactory.prototypeFactory(input).create()</code>.
  *
  * @since 3.0
  * @version $Id$
@@ -49,7 +49,7 @@ public class CloneTransformer<T> implements Transformer<T, T>, Serializable {
     }
 
     /**
-     * Constructor
+     * Constructor.
      */
     private CloneTransformer() {
         super();
diff --git a/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java
index c435107ee..f0db919e0 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java
@@ -53,7 +53,7 @@ public class ClosureTransformer<T> implements Transformer<T, T>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>closureTransformer</code> if you want that.
      * 
      * @param closure  the closure to call, not null
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java b/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java
index 49ddb7301..26a6f4f92 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java
@@ -44,7 +44,7 @@ import org.apache.commons.collections4.Predicate;
  * following way:
  *
  * <pre>
- * ComparatorPredicate.getInstance(ONE, comparator).evaluate(TWO);
+ * ComparatorPredicate.comparatorPredicate(ONE, comparator).evaluate(TWO);
  * </pre>
  *
  * The input variable <code>TWO</code> in compared to the stored variable <code>ONE</code> using
@@ -66,7 +66,7 @@ import org.apache.commons.collections4.Predicate;
  * evaluation of a comparator result.
  *
  * <pre>
- * ComparatorPredicate.getInstance(ONE, comparator, <b>ComparatorPredicate.Criterion.GREATER</b>).evaluate(TWO);
+ * ComparatorPredicate.comparatorPredicate(ONE, comparator,<b>ComparatorPredicate.Criterion.GREATER</b>).evaluate(TWO);
  * </pre>
  *
  * The input variable TWO is compared to the stored variable ONE using the supplied <code>comparator</code>
@@ -131,7 +131,7 @@ public class ComparatorPredicate<T> implements Predicate<T>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want.
+     * Use <code>comparatorPredicate</code> if you want that.
      *
      * @param object  the object to compare to
      * @param comparator  the comparator to use for comparison
diff --git a/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java b/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java
index 02851b712..8efdd7fb4 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java
@@ -58,7 +58,7 @@ public class ConstantFactory<T> implements Factory<T>, Serializable {
     
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>constantFactory</code> if you want that.
      * 
      * @param constantToReturn  the constant to return each time
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java
index d35e650e4..c8b229a67 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java
@@ -70,7 +70,7 @@ public class ConstantTransformer<I, O> implements Transformer<I, O>, Serializabl
     
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>constantTransformer</code> if you want that.
      * 
      * @param constantToReturn  the constant to return each time
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java b/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java
index a34297cd1..e2b957680 100644
--- a/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java
@@ -74,7 +74,7 @@ public final class EqualPredicate<T> implements Predicate<T>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>equalPredicate</code> if you want that.
      * 
      * @param object  the object to compare to
      */
@@ -86,7 +86,7 @@ public final class EqualPredicate<T> implements Predicate<T>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>equalPredicate</code> if you want that.
      * 
      * @param object  the object to compare to
      * @param equator  the equator to use for comparison
diff --git a/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java b/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java
index 2f133b3db..7fafbbc09 100644
--- a/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java
@@ -53,7 +53,7 @@ public class FactoryTransformer<I, O> implements Transformer<I, O>, Serializable
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>factoryTransformer</code> if you want that.
      * 
      * @param factory  the factory to call, not null
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/ForClosure.java b/src/main/java/org/apache/commons/collections4/functors/ForClosure.java
index dadaa2974..06af351cd 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ForClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ForClosure.java
@@ -60,7 +60,7 @@ public class ForClosure<E> implements Closure<E>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>forClosure</code> if you want that.
      * 
      * @param count  the number of times to execute the closure
      * @param closure  the closure to execute, not null
diff --git a/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java b/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java
index 5d7e71ca4..7f7de1330 100644
--- a/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java
@@ -52,7 +52,7 @@ public final class IdentityPredicate<T> implements Predicate<T>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>identityPredicate</code> if you want that.
      *
      * @param object  the object to compare to
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/IfClosure.java b/src/main/java/org/apache/commons/collections4/functors/IfClosure.java
index 7ae30a20e..07190adaf 100644
--- a/src/main/java/org/apache/commons/collections4/functors/IfClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/IfClosure.java
@@ -81,7 +81,7 @@ public class IfClosure<E> implements Closure<E>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>ifClosure</code> if you want that.
      * <p>
      * This constructor creates a closure that performs no action when
      * the predicate is false.
@@ -96,7 +96,7 @@ public class IfClosure<E> implements Closure<E>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>ifClosure</code> if you want that.
      * 
      * @param predicate  predicate to switch on, not null
      * @param trueClosure  closure used if true, not null
diff --git a/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java b/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java
index e1a33ab1b..4545869eb 100644
--- a/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java
@@ -51,7 +51,7 @@ public final class InstanceofPredicate implements Predicate<Object>, Serializabl
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>instanceOfPredicate</code> if you want that.
      *
      * @param type  the type to check for
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java b/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java
index 7490ead9f..deecb3589 100644
--- a/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java
+++ b/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java
@@ -72,7 +72,7 @@ public class InstantiateFactory<T> implements Factory<T>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>instantiateFactory</code> if you want that.
      * 
      * @param classToInstantiate  the class to instantiate
      */
@@ -86,7 +86,7 @@ public class InstantiateFactory<T> implements Factory<T>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>instantiateFactory</code> if you want that.
      * 
      * @param classToInstantiate  the class to instantiate
      * @param paramTypes  the constructor parameter types, cloned
diff --git a/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java b/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java
index 25a8234b4..c1d623485 100644
--- a/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java
@@ -86,7 +86,7 @@ public class InstantiateTransformer<T> implements Transformer<Class<? extends T>
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>instantiateTransformer</code> if you want that.
      *
      * @param paramTypes  the constructor parameter types, not cloned
      * @param args  the constructor arguments, not cloned
diff --git a/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java b/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java
index 1bb459672..ec233bb4b 100644
--- a/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java
@@ -100,7 +100,7 @@ public class InvokerTransformer<I, O> implements Transformer<I, O>, Serializable
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>invokerTransformer</code> if you want that.
      * 
      * @param methodName  the method to call
      * @param paramTypes  the constructor parameter types, not cloned
diff --git a/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java b/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java
index 770017f54..eb02a5c00 100644
--- a/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java
@@ -55,7 +55,7 @@ public final class MapTransformer<I, O> implements Transformer<I, O>, Serializab
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>mapTransformer</code> if you want that.
      *
      * @param map  the map to use for lookup, not cloned
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java b/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java
index 4a7055842..5026088f5 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java
@@ -47,7 +47,7 @@ public final class NOPClosure<E> implements Closure<E>, Serializable {
     }
 
     /**
-     * Constructor
+     * Constructor.
      */
     private NOPClosure() {
         super();
diff --git a/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java b/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java
index 63ad6cad2..f530c3f5b 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java
@@ -47,7 +47,7 @@ public class NOPTransformer<T> implements Transformer<T, T>, Serializable {
     }
 
     /**
-     * Constructor
+     * Constructor.
      */
     private NOPTransformer() {
         super();
diff --git a/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java
index 3e820db28..f9a8bfb2e 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java
@@ -77,7 +77,7 @@ public final class NonePredicate<T> extends AbstractQuantifierPredicate<T> imple
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>nonePredicate</code> if you want that.
      *
      * @param predicates  the predicates to check, not cloned, not null
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java
index a61c084f5..1f56face1 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java
@@ -51,7 +51,7 @@ public final class NotPredicate<T> implements Predicate<T>, PredicateDecorator<T
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>notPredicate</code> if you want that.
      * 
      * @param predicate  the predicate to call after the null check
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java
index 6618b64d6..93692c190 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java
@@ -52,7 +52,7 @@ public final class NullIsExceptionPredicate<T> implements Predicate<T>, Predicat
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>nullIsExceptionPredicate</code> if you want that.
      * 
      * @param predicate  the predicate to call after the null check
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java
index 39b07a75b..c18f43165 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java
@@ -51,7 +51,7 @@ public final class NullIsFalsePredicate<T> implements Predicate<T>, PredicateDec
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>nullIsFalsePredicate</code> if you want that.
      *
      * @param predicate  the predicate to call after the null check
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java
index e8de95659..7bc57f5ea 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java
@@ -51,7 +51,7 @@ public final class NullIsTruePredicate<T> implements Predicate<T>, PredicateDeco
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>nullIsTruePredicate</code> if you want that.
      * 
      * @param predicate  the predicate to call after the null check
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java b/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java
index 3306db09d..30ecbdf93 100644
--- a/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java
@@ -77,7 +77,7 @@ public final class OnePredicate<T> extends AbstractQuantifierPredicate<T> implem
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>onePredicate</code> if you want that.
      * 
      * @param predicates  the predicates to check, not cloned, not null
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java b/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java
index 7a880b96c..e4042678f 100644
--- a/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java
@@ -55,7 +55,7 @@ public final class OrPredicate<T> implements Predicate<T>, PredicateDecorator<T>
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>orPredicate</code> if you want that.
      *
      * @param predicate1  the first predicate to check, not null
      * @param predicate2  the second predicate to check, not null
diff --git a/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java b/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java
index 0257c468c..e0f588dc7 100644
--- a/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java
@@ -53,7 +53,7 @@ public class PredicateTransformer<T> implements Transformer<T, Boolean>, Seriali
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>predicateTransformer</code> if you want that.
      * 
      * @param predicate  the predicate to call, not null
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java b/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java
index 6e66944dd..acefafcc2 100644
--- a/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java
+++ b/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java
@@ -80,8 +80,7 @@ public class PrototypeFactory {
     }
 
     /**
-     * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Restricted constructor.
      */
     private PrototypeFactory() {
         super();
diff --git a/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java b/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java
index c6a52646e..67dfb8a05 100644
--- a/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java
@@ -109,7 +109,7 @@ public class SwitchClosure<E> implements Closure<E>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>switchClosure</code> if you want that.
      *
      * @param predicates  array of predicates, not cloned, no nulls
      * @param closures  matching array of closures, not cloned, no nulls
diff --git a/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
index dfff0bcd4..2381fabc0 100644
--- a/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
@@ -121,7 +121,7 @@ public class SwitchTransformer<I, O> implements Transformer<I, O>, Serializable
     
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>switchTransformer</code> if you want that.
      * 
      * @param predicates  array of predicates, not cloned, no nulls
      * @param transformers  matching array of transformers, not cloned, no nulls
diff --git a/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java b/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java
index 652c084fe..7ed072feb 100644
--- a/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java
@@ -61,7 +61,7 @@ public final class TransformedPredicate<T> implements Predicate<T>, PredicateDec
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>transformedPredicate</code> if you want that.
      *
      * @param transformer  the transformer to use
      * @param predicate  the predicate to decorate
diff --git a/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java b/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java
index b47b45416..2dc0abad5 100644
--- a/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java
@@ -54,7 +54,7 @@ public class TransformerClosure<E> implements Closure<E>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>transformerClosure</code> if you want that.
      * 
      * @param transformer  the transformer to call, not null
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java b/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java
index ce6418806..df986b346 100644
--- a/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java
@@ -53,7 +53,7 @@ public final class TransformerPredicate<T> implements Predicate<T>, Serializable
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>transformerPredicate</code> if you want that.
      *
      * @param transformer  the transformer to decorate
      */
diff --git a/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java b/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java
index d75141346..fa643392c 100644
--- a/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java
@@ -50,7 +50,7 @@ public final class UniquePredicate<T> implements Predicate<T>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>uniquePredicate</code> if you want that.
      */
     public UniquePredicate() {
         super();
diff --git a/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java b/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java
index 939b025f1..90bb73353 100644
--- a/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java
@@ -63,7 +63,7 @@ public class WhileClosure<E> implements Closure<E>, Serializable {
 
     /**
      * Constructor that performs no validation.
-     * Use <code>getInstance</code> if you want that.
+     * Use <code>whileClosure</code> if you want that.
      * 
      * @param predicate  the predicate used to evaluate when the loop terminates, not null
      * @param closure  the closure the execute, not null