From 3bedf271e87bef32b672252a1d83ef4466579207 Mon Sep 17 00:00:00 2001
From: "James W. Carman" <jcarman@apache.org>
Date: Wed, 23 Nov 2005 14:06:56 +0000
Subject: [PATCH] 37106: serialVersionUIDs should be private (static final
 long)

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@348444 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/commons/collections/ReferenceMap.java    | 2 +-
 .../apache/commons/collections/functors/AllPredicate.java    | 2 +-
 .../apache/commons/collections/functors/AndPredicate.java    | 2 +-
 .../apache/commons/collections/functors/AnyPredicate.java    | 2 +-
 .../apache/commons/collections/functors/ChainedClosure.java  | 2 +-
 .../commons/collections/functors/ChainedTransformer.java     | 2 +-
 .../commons/collections/functors/CloneTransformer.java       | 2 +-
 .../commons/collections/functors/ClosureTransformer.java     | 2 +-
 .../apache/commons/collections/functors/ConstantFactory.java | 2 +-
 .../commons/collections/functors/ConstantTransformer.java    | 2 +-
 .../apache/commons/collections/functors/EqualPredicate.java  | 2 +-
 .../commons/collections/functors/ExceptionClosure.java       | 2 +-
 .../commons/collections/functors/ExceptionFactory.java       | 2 +-
 .../commons/collections/functors/ExceptionPredicate.java     | 2 +-
 .../commons/collections/functors/ExceptionTransformer.java   | 2 +-
 .../commons/collections/functors/FactoryTransformer.java     | 2 +-
 .../apache/commons/collections/functors/FalsePredicate.java  | 2 +-
 .../org/apache/commons/collections/functors/ForClosure.java  | 2 +-
 .../commons/collections/functors/IdentityPredicate.java      | 2 +-
 .../org/apache/commons/collections/functors/IfClosure.java   | 2 +-
 .../commons/collections/functors/InstanceofPredicate.java    | 2 +-
 .../commons/collections/functors/InstantiateFactory.java     | 2 +-
 .../commons/collections/functors/InstantiateTransformer.java | 2 +-
 .../commons/collections/functors/InvokerTransformer.java     | 2 +-
 .../apache/commons/collections/functors/MapTransformer.java  | 2 +-
 .../org/apache/commons/collections/functors/NOPClosure.java  | 2 +-
 .../apache/commons/collections/functors/NOPTransformer.java  | 2 +-
 .../apache/commons/collections/functors/NonePredicate.java   | 2 +-
 .../commons/collections/functors/NotNullPredicate.java       | 2 +-
 .../apache/commons/collections/functors/NotPredicate.java    | 2 +-
 .../collections/functors/NullIsExceptionPredicate.java       | 2 +-
 .../commons/collections/functors/NullIsFalsePredicate.java   | 2 +-
 .../commons/collections/functors/NullIsTruePredicate.java    | 2 +-
 .../apache/commons/collections/functors/NullPredicate.java   | 2 +-
 .../apache/commons/collections/functors/OnePredicate.java    | 2 +-
 .../org/apache/commons/collections/functors/OrPredicate.java | 2 +-
 .../commons/collections/functors/PredicateTransformer.java   | 2 +-
 .../commons/collections/functors/PrototypeFactory.java       | 4 ++--
 .../commons/collections/functors/StringValueTransformer.java | 2 +-
 .../apache/commons/collections/functors/SwitchClosure.java   | 2 +-
 .../commons/collections/functors/SwitchTransformer.java      | 2 +-
 .../commons/collections/functors/TransformedPredicate.java   | 2 +-
 .../commons/collections/functors/TransformerClosure.java     | 2 +-
 .../commons/collections/functors/TransformerPredicate.java   | 2 +-
 .../apache/commons/collections/functors/TruePredicate.java   | 2 +-
 .../apache/commons/collections/functors/UniquePredicate.java | 2 +-
 .../apache/commons/collections/functors/WhileClosure.java    | 2 +-
 src/test/org/apache/commons/collections/TestMapUtils.java    | 5 +++++
 48 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/src/java/org/apache/commons/collections/ReferenceMap.java b/src/java/org/apache/commons/collections/ReferenceMap.java
index 7af5cdb3a..2383022e1 100644
--- a/src/java/org/apache/commons/collections/ReferenceMap.java
+++ b/src/java/org/apache/commons/collections/ReferenceMap.java
@@ -86,7 +86,7 @@ public class ReferenceMap extends AbstractMap {
     /**
      *  For serialization.
      */
-    final private static long serialVersionUID = -3370601314380922368L;
+    private static final long serialVersionUID = -3370601314380922368L;
 
 
     /**
diff --git a/src/java/org/apache/commons/collections/functors/AllPredicate.java b/src/java/org/apache/commons/collections/functors/AllPredicate.java
index 6280ce54e..56b6fbd98 100644
--- a/src/java/org/apache/commons/collections/functors/AllPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/AllPredicate.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Predicate;
 public final class AllPredicate implements Predicate, PredicateDecorator, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -3094696765038308799L;
+    private static final long serialVersionUID = -3094696765038308799L;
     
     /** The array of predicates to call */
     private final Predicate[] iPredicates;
diff --git a/src/java/org/apache/commons/collections/functors/AndPredicate.java b/src/java/org/apache/commons/collections/functors/AndPredicate.java
index 430b8b0e4..489444f95 100644
--- a/src/java/org/apache/commons/collections/functors/AndPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/AndPredicate.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.Predicate;
 public final class AndPredicate implements Predicate, PredicateDecorator, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 4189014213763186912L;
+    private static final long serialVersionUID = 4189014213763186912L;
     
     /** The array of predicates to call */
     private final Predicate iPredicate1;
diff --git a/src/java/org/apache/commons/collections/functors/AnyPredicate.java b/src/java/org/apache/commons/collections/functors/AnyPredicate.java
index 2b06b25e5..417b00478 100644
--- a/src/java/org/apache/commons/collections/functors/AnyPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/AnyPredicate.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Predicate;
 public final class AnyPredicate implements Predicate, PredicateDecorator, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 7429999530934647542L;
+    private static final long serialVersionUID = 7429999530934647542L;
     
     /** The array of predicates to call */
     private final Predicate[] iPredicates;
diff --git a/src/java/org/apache/commons/collections/functors/ChainedClosure.java b/src/java/org/apache/commons/collections/functors/ChainedClosure.java
index bf5a007bd..7fee89a03 100644
--- a/src/java/org/apache/commons/collections/functors/ChainedClosure.java
+++ b/src/java/org/apache/commons/collections/functors/ChainedClosure.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.Closure;
 public class ChainedClosure implements Closure, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -3520677225766901240L;
+    private static final long serialVersionUID = -3520677225766901240L;
 
     /** The closures to call in turn */
     private final Closure[] iClosures;
diff --git a/src/java/org/apache/commons/collections/functors/ChainedTransformer.java b/src/java/org/apache/commons/collections/functors/ChainedTransformer.java
index ac327d2cb..3fc48a9b9 100644
--- a/src/java/org/apache/commons/collections/functors/ChainedTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ChainedTransformer.java
@@ -35,7 +35,7 @@ import org.apache.commons.collections.Transformer;
 public class ChainedTransformer implements Transformer, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 3514945074733160196L;
+    private static final long serialVersionUID = 3514945074733160196L;
 
     /** The transformers to call in turn */
     private final Transformer[] iTransformers;
diff --git a/src/java/org/apache/commons/collections/functors/CloneTransformer.java b/src/java/org/apache/commons/collections/functors/CloneTransformer.java
index 3e6d6caa0..2e482bc77 100644
--- a/src/java/org/apache/commons/collections/functors/CloneTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/CloneTransformer.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.Transformer;
 public class CloneTransformer implements Transformer, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -8188742709499652567L;
+    private static final long serialVersionUID = -8188742709499652567L;
 
     /** Singleton predicate instance */
     public static final Transformer INSTANCE = new CloneTransformer();
diff --git a/src/java/org/apache/commons/collections/functors/ClosureTransformer.java b/src/java/org/apache/commons/collections/functors/ClosureTransformer.java
index 8e5929e76..322512e0e 100644
--- a/src/java/org/apache/commons/collections/functors/ClosureTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ClosureTransformer.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.Transformer;
 public class ClosureTransformer implements Transformer, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 478466901448617286L;
+    private static final long serialVersionUID = 478466901448617286L;
 
     /** The closure to wrap */
     private final Closure iClosure;
diff --git a/src/java/org/apache/commons/collections/functors/ConstantFactory.java b/src/java/org/apache/commons/collections/functors/ConstantFactory.java
index 9f7fa16f3..617b6d5b0 100644
--- a/src/java/org/apache/commons/collections/functors/ConstantFactory.java
+++ b/src/java/org/apache/commons/collections/functors/ConstantFactory.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.Factory;
 public class ConstantFactory implements Factory, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -3520677225766901240L;
+    private static final long serialVersionUID = -3520677225766901240L;
     
     /** Returns null each time */
     public static final Factory NULL_INSTANCE = new ConstantFactory(null);
diff --git a/src/java/org/apache/commons/collections/functors/ConstantTransformer.java b/src/java/org/apache/commons/collections/functors/ConstantTransformer.java
index a828fa425..681dd6f26 100644
--- a/src/java/org/apache/commons/collections/functors/ConstantTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ConstantTransformer.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.Transformer;
 public class ConstantTransformer implements Transformer, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 6374440726369055124L;
+    private static final long serialVersionUID = 6374440726369055124L;
     
     /** Returns null each time */
     public static final Transformer NULL_INSTANCE = new ConstantTransformer(null);
diff --git a/src/java/org/apache/commons/collections/functors/EqualPredicate.java b/src/java/org/apache/commons/collections/functors/EqualPredicate.java
index 9a4c30d29..0f1069ef1 100644
--- a/src/java/org/apache/commons/collections/functors/EqualPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/EqualPredicate.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Predicate;
 public final class EqualPredicate implements Predicate, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 5633766978029907089L;
+    private static final long serialVersionUID = 5633766978029907089L;
 
     /** The value to compare to */
     private final Object iValue;
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionClosure.java b/src/java/org/apache/commons/collections/functors/ExceptionClosure.java
index 9a5fdae34..bd73cf195 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionClosure.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionClosure.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.FunctorException;
 public final class ExceptionClosure implements Closure, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 7179106032121985545L;
+    private static final long serialVersionUID = 7179106032121985545L;
     
 
     /** Singleton predicate instance */
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionFactory.java b/src/java/org/apache/commons/collections/functors/ExceptionFactory.java
index 231568e1d..c8f9e4965 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionFactory.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionFactory.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.FunctorException;
 public final class ExceptionFactory implements Factory, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 7179106032121985545L;
+    private static final long serialVersionUID = 7179106032121985545L;
     
 
     /** Singleton predicate instance */
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java b/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java
index ab8e52f43..3e6f73652 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Predicate;
 public final class ExceptionPredicate implements Predicate, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 7179106032121985545L;
+    private static final long serialVersionUID = 7179106032121985545L;
     
     /** Singleton predicate instance */
     public static final Predicate INSTANCE = new ExceptionPredicate();
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java b/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java
index 27a7f11ce..1cf137ac0 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Transformer;
 public final class ExceptionTransformer implements Transformer, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 7179106032121985545L;
+    private static final long serialVersionUID = 7179106032121985545L;
     
 
     /** Singleton predicate instance */
diff --git a/src/java/org/apache/commons/collections/functors/FactoryTransformer.java b/src/java/org/apache/commons/collections/functors/FactoryTransformer.java
index 63e738ab0..5245c79de 100644
--- a/src/java/org/apache/commons/collections/functors/FactoryTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/FactoryTransformer.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Transformer;
 public class FactoryTransformer implements Transformer, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -6817674502475353160L;
+    private static final long serialVersionUID = -6817674502475353160L;
 
     /** The factory to wrap */
     private final Factory iFactory;
diff --git a/src/java/org/apache/commons/collections/functors/FalsePredicate.java b/src/java/org/apache/commons/collections/functors/FalsePredicate.java
index 603966fea..d492bd77c 100644
--- a/src/java/org/apache/commons/collections/functors/FalsePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/FalsePredicate.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.Predicate;
 public final class FalsePredicate implements Predicate, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 7533784454832764388L;
+    private static final long serialVersionUID = 7533784454832764388L;
     
     /** Singleton predicate instance */
     public static final Predicate INSTANCE = new FalsePredicate();
diff --git a/src/java/org/apache/commons/collections/functors/ForClosure.java b/src/java/org/apache/commons/collections/functors/ForClosure.java
index 76c15a6aa..c1be839f2 100644
--- a/src/java/org/apache/commons/collections/functors/ForClosure.java
+++ b/src/java/org/apache/commons/collections/functors/ForClosure.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.Closure;
 public class ForClosure implements Closure, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -1190120533393621674L;
+    private static final long serialVersionUID = -1190120533393621674L;
 
     /** The number of times to loop */
     private final int iCount;
diff --git a/src/java/org/apache/commons/collections/functors/IdentityPredicate.java b/src/java/org/apache/commons/collections/functors/IdentityPredicate.java
index 53d8cee4c..b9a4a4826 100644
--- a/src/java/org/apache/commons/collections/functors/IdentityPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/IdentityPredicate.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Predicate;
 public final class IdentityPredicate implements Predicate, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -89901658494523293L;
+    private static final long serialVersionUID = -89901658494523293L;
 
     
     /** The value to compare to */
diff --git a/src/java/org/apache/commons/collections/functors/IfClosure.java b/src/java/org/apache/commons/collections/functors/IfClosure.java
index db0b853c1..b50c1a2e3 100644
--- a/src/java/org/apache/commons/collections/functors/IfClosure.java
+++ b/src/java/org/apache/commons/collections/functors/IfClosure.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.Predicate;
 public class IfClosure implements Closure, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 3518477308466486130L;
+    private static final long serialVersionUID = 3518477308466486130L;
 
     /** The test */
     private final Predicate iPredicate;
diff --git a/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java b/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java
index a239dbdc7..eabc8f4b7 100644
--- a/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Predicate;
 public final class InstanceofPredicate implements Predicate, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -6682656911025165584L;
+    private static final long serialVersionUID = -6682656911025165584L;
 
     /** The type to compare to */
     private final Class iType;
diff --git a/src/java/org/apache/commons/collections/functors/InstantiateFactory.java b/src/java/org/apache/commons/collections/functors/InstantiateFactory.java
index 590173d65..9a14c4afd 100644
--- a/src/java/org/apache/commons/collections/functors/InstantiateFactory.java
+++ b/src/java/org/apache/commons/collections/functors/InstantiateFactory.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.FunctorException;
 public class InstantiateFactory implements Factory, Serializable {
 
     /** The serial version */
-    static final long serialVersionUID = -7732226881069447957L;
+    private static final long serialVersionUID = -7732226881069447957L;
 
     /** The class to create */
     private final Class iClassToInstantiate;
diff --git a/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java b/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
index 68c797444..db4367368 100644
--- a/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.Transformer;
 public class InstantiateTransformer implements Transformer, Serializable {
 
     /** The serial version */
-    static final long serialVersionUID = 3786388740793356347L;
+    private static final long serialVersionUID = 3786388740793356347L;
     
     /** Singleton instance that uses the no arg constructor */
     public static final Transformer NO_ARG_INSTANCE = new InstantiateTransformer();
diff --git a/src/java/org/apache/commons/collections/functors/InvokerTransformer.java b/src/java/org/apache/commons/collections/functors/InvokerTransformer.java
index 4fa25b215..6526eadc2 100644
--- a/src/java/org/apache/commons/collections/functors/InvokerTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/InvokerTransformer.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.Transformer;
 public class InvokerTransformer implements Transformer, Serializable {
 
     /** The serial version */
-    static final long serialVersionUID = -8653385846894047688L;
+    private static final long serialVersionUID = -8653385846894047688L;
     
     /** The method name to call */
     private final String iMethodName;
diff --git a/src/java/org/apache/commons/collections/functors/MapTransformer.java b/src/java/org/apache/commons/collections/functors/MapTransformer.java
index eb496bfa9..2db5a4caf 100644
--- a/src/java/org/apache/commons/collections/functors/MapTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/MapTransformer.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.Transformer;
 public final class MapTransformer implements Transformer, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 862391807045468939L;
+    private static final long serialVersionUID = 862391807045468939L;
     
     /** The map of data to lookup in */
     private final Map iMap;
diff --git a/src/java/org/apache/commons/collections/functors/NOPClosure.java b/src/java/org/apache/commons/collections/functors/NOPClosure.java
index 69e31e6f6..35ecb33a9 100644
--- a/src/java/org/apache/commons/collections/functors/NOPClosure.java
+++ b/src/java/org/apache/commons/collections/functors/NOPClosure.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.Closure;
 public class NOPClosure implements Closure, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 3518477308466486130L;
+    private static final long serialVersionUID = 3518477308466486130L;
 
     /** Singleton predicate instance */
     public static final Closure INSTANCE = new NOPClosure();
diff --git a/src/java/org/apache/commons/collections/functors/NOPTransformer.java b/src/java/org/apache/commons/collections/functors/NOPTransformer.java
index 9c7232b99..986c659a3 100644
--- a/src/java/org/apache/commons/collections/functors/NOPTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/NOPTransformer.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.Transformer;
 public class NOPTransformer implements Transformer, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 2133891748318574490L;
+    private static final long serialVersionUID = 2133891748318574490L;
 
     /** Singleton predicate instance */
     public static final Transformer INSTANCE = new NOPTransformer();
diff --git a/src/java/org/apache/commons/collections/functors/NonePredicate.java b/src/java/org/apache/commons/collections/functors/NonePredicate.java
index 1683d822c..87e0a159b 100644
--- a/src/java/org/apache/commons/collections/functors/NonePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NonePredicate.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Predicate;
 public final class NonePredicate implements Predicate, PredicateDecorator, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 2007613066565892961L;
+    private static final long serialVersionUID = 2007613066565892961L;
     
     /** The array of predicates to call */
     private final Predicate[] iPredicates;
diff --git a/src/java/org/apache/commons/collections/functors/NotNullPredicate.java b/src/java/org/apache/commons/collections/functors/NotNullPredicate.java
index 92f732002..8b8826107 100644
--- a/src/java/org/apache/commons/collections/functors/NotNullPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NotNullPredicate.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.Predicate;
 public final class NotNullPredicate implements Predicate, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 7533784454832764388L;
+    private static final long serialVersionUID = 7533784454832764388L;
     
     /** Singleton predicate instance */
     public static final Predicate INSTANCE = new NotNullPredicate();
diff --git a/src/java/org/apache/commons/collections/functors/NotPredicate.java b/src/java/org/apache/commons/collections/functors/NotPredicate.java
index 493bb2cea..4325a5eee 100644
--- a/src/java/org/apache/commons/collections/functors/NotPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NotPredicate.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.Predicate;
 public final class NotPredicate implements Predicate, PredicateDecorator, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -2654603322338049674L;
+    private static final long serialVersionUID = -2654603322338049674L;
     
     /** The predicate to decorate */
     private final Predicate iPredicate;
diff --git a/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java b/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
index b1cddb068..b078d1509 100644
--- a/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Predicate;
 public final class NullIsExceptionPredicate implements Predicate, PredicateDecorator, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 3243449850504576071L;
+    private static final long serialVersionUID = 3243449850504576071L;
     
     /** The predicate to decorate */
     private final Predicate iPredicate;
diff --git a/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java b/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
index d43f0c732..2587397dc 100644
--- a/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.Predicate;
 public final class NullIsFalsePredicate implements Predicate, PredicateDecorator, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -2997501534564735525L;
+    private static final long serialVersionUID = -2997501534564735525L;
     
     /** The predicate to decorate */
     private final Predicate iPredicate;
diff --git a/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java b/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
index 2989da2fd..3c47ca2cb 100644
--- a/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.Predicate;
 public final class NullIsTruePredicate implements Predicate, PredicateDecorator, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -7625133768987126273L;
+    private static final long serialVersionUID = -7625133768987126273L;
     
     /** The predicate to decorate */
     private final Predicate iPredicate;
diff --git a/src/java/org/apache/commons/collections/functors/NullPredicate.java b/src/java/org/apache/commons/collections/functors/NullPredicate.java
index 299706f92..f68c2580f 100644
--- a/src/java/org/apache/commons/collections/functors/NullPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NullPredicate.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.Predicate;
 public final class NullPredicate implements Predicate, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 7533784454832764388L;
+    private static final long serialVersionUID = 7533784454832764388L;
     
     /** Singleton predicate instance */
     public static final Predicate INSTANCE = new NullPredicate();
diff --git a/src/java/org/apache/commons/collections/functors/OnePredicate.java b/src/java/org/apache/commons/collections/functors/OnePredicate.java
index 513acdac1..9c1312772 100644
--- a/src/java/org/apache/commons/collections/functors/OnePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/OnePredicate.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Predicate;
 public final class OnePredicate implements Predicate, PredicateDecorator, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -8125389089924745785L;
+    private static final long serialVersionUID = -8125389089924745785L;
     
     /** The array of predicates to call */
     private final Predicate[] iPredicates;
diff --git a/src/java/org/apache/commons/collections/functors/OrPredicate.java b/src/java/org/apache/commons/collections/functors/OrPredicate.java
index 57a2f3725..5aa68adc2 100644
--- a/src/java/org/apache/commons/collections/functors/OrPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/OrPredicate.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.Predicate;
 public final class OrPredicate implements Predicate, PredicateDecorator, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -8791518325735182855L;
+    private static final long serialVersionUID = -8791518325735182855L;
     
     /** The array of predicates to call */
     private final Predicate iPredicate1;
diff --git a/src/java/org/apache/commons/collections/functors/PredicateTransformer.java b/src/java/org/apache/commons/collections/functors/PredicateTransformer.java
index 139c1a181..53c34d352 100644
--- a/src/java/org/apache/commons/collections/functors/PredicateTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/PredicateTransformer.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.Transformer;
 public class PredicateTransformer implements Transformer, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 5278818408044349346L;
+    private static final long serialVersionUID = 5278818408044349346L;
 
     /** The closure to wrap */
     private final Predicate iPredicate;
diff --git a/src/java/org/apache/commons/collections/functors/PrototypeFactory.java b/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
index 77400e56b..08df99a09 100644
--- a/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
+++ b/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
@@ -95,7 +95,7 @@ public class PrototypeFactory {
     static class PrototypeCloneFactory implements Factory, Serializable {
         
         /** The serial version */
-        static final long serialVersionUID = 5604271422565175555L;
+        private static final long serialVersionUID = 5604271422565175555L;
         
         /** The object to clone each time */
         private final Object iPrototype;
@@ -153,7 +153,7 @@ public class PrototypeFactory {
     static class PrototypeSerializationFactory implements Factory, Serializable {
         
         /** The serial version */
-        static final long serialVersionUID = -8704966966139178833L;
+        private static final long serialVersionUID = -8704966966139178833L;
         
         /** The object to clone via serialization each time */
         private final Serializable iPrototype;
diff --git a/src/java/org/apache/commons/collections/functors/StringValueTransformer.java b/src/java/org/apache/commons/collections/functors/StringValueTransformer.java
index 25e990a88..5a7eb305e 100644
--- a/src/java/org/apache/commons/collections/functors/StringValueTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/StringValueTransformer.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.Transformer;
 public final class StringValueTransformer implements Transformer, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 7511110693171758606L;
+    private static final long serialVersionUID = 7511110693171758606L;
 
     /** Singleton predicate instance */
     public static final Transformer INSTANCE = new StringValueTransformer();
diff --git a/src/java/org/apache/commons/collections/functors/SwitchClosure.java b/src/java/org/apache/commons/collections/functors/SwitchClosure.java
index af48c422e..be4d4e579 100644
--- a/src/java/org/apache/commons/collections/functors/SwitchClosure.java
+++ b/src/java/org/apache/commons/collections/functors/SwitchClosure.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.Predicate;
 public class SwitchClosure implements Closure, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 3518477308466486130L;
+    private static final long serialVersionUID = 3518477308466486130L;
 
     /** The tests to consider */
     private final Predicate[] iPredicates;
diff --git a/src/java/org/apache/commons/collections/functors/SwitchTransformer.java b/src/java/org/apache/commons/collections/functors/SwitchTransformer.java
index 2455753f3..52873af61 100644
--- a/src/java/org/apache/commons/collections/functors/SwitchTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/SwitchTransformer.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.Transformer;
 public class SwitchTransformer implements Transformer, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -6404460890903469332L;
+    private static final long serialVersionUID = -6404460890903469332L;
 
     /** The tests to consider */
     private final Predicate[] iPredicates;
diff --git a/src/java/org/apache/commons/collections/functors/TransformedPredicate.java b/src/java/org/apache/commons/collections/functors/TransformedPredicate.java
index 55d66b472..bf7c36bc8 100644
--- a/src/java/org/apache/commons/collections/functors/TransformedPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/TransformedPredicate.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.Transformer;
 public final class TransformedPredicate implements Predicate, PredicateDecorator, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -5596090919668315834L;
+    private static final long serialVersionUID = -5596090919668315834L;
     
     /** The transformer to call */
     private final Transformer iTransformer;
diff --git a/src/java/org/apache/commons/collections/functors/TransformerClosure.java b/src/java/org/apache/commons/collections/functors/TransformerClosure.java
index f2427f01a..b84189907 100644
--- a/src/java/org/apache/commons/collections/functors/TransformerClosure.java
+++ b/src/java/org/apache/commons/collections/functors/TransformerClosure.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.Transformer;
 public class TransformerClosure implements Closure, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -5194992589193388969L;
+    private static final long serialVersionUID = -5194992589193388969L;
 
     /** The transformer to wrap */
     private final Transformer iTransformer;
diff --git a/src/java/org/apache/commons/collections/functors/TransformerPredicate.java b/src/java/org/apache/commons/collections/functors/TransformerPredicate.java
index e51876e5d..499eab176 100644
--- a/src/java/org/apache/commons/collections/functors/TransformerPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/TransformerPredicate.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.Transformer;
 public final class TransformerPredicate implements Predicate, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -2407966402920578741L;
+    private static final long serialVersionUID = -2407966402920578741L;
     
     /** The transformer to call */
     private final Transformer iTransformer;
diff --git a/src/java/org/apache/commons/collections/functors/TruePredicate.java b/src/java/org/apache/commons/collections/functors/TruePredicate.java
index a10898d98..09bf42a7f 100644
--- a/src/java/org/apache/commons/collections/functors/TruePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/TruePredicate.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.Predicate;
 public final class TruePredicate implements Predicate, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = 3374767158756189740L;
+    private static final long serialVersionUID = 3374767158756189740L;
     
     /** Singleton predicate instance */
     public static final Predicate INSTANCE = new TruePredicate();
diff --git a/src/java/org/apache/commons/collections/functors/UniquePredicate.java b/src/java/org/apache/commons/collections/functors/UniquePredicate.java
index 2e5fcfab9..18ca3b94d 100644
--- a/src/java/org/apache/commons/collections/functors/UniquePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/UniquePredicate.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.Predicate;
 public final class UniquePredicate implements Predicate, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -3319417438027438040L;
+    private static final long serialVersionUID = -3319417438027438040L;
     
     /** The set of previously seen objects */
     private final Set iSet = new HashSet();
diff --git a/src/java/org/apache/commons/collections/functors/WhileClosure.java b/src/java/org/apache/commons/collections/functors/WhileClosure.java
index d8fa0e4f7..80933223d 100644
--- a/src/java/org/apache/commons/collections/functors/WhileClosure.java
+++ b/src/java/org/apache/commons/collections/functors/WhileClosure.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.Predicate;
 public class WhileClosure implements Closure, Serializable {
 
     /** Serial version UID */
-    static final long serialVersionUID = -3110538116913760108L;
+    private static final long serialVersionUID = -3110538116913760108L;
 
     /** The test condition */
     private final Predicate iPredicate;
diff --git a/src/test/org/apache/commons/collections/TestMapUtils.java b/src/test/org/apache/commons/collections/TestMapUtils.java
index 45c9f83d5..b5a74dee8 100644
--- a/src/test/org/apache/commons/collections/TestMapUtils.java
+++ b/src/test/org/apache/commons/collections/TestMapUtils.java
@@ -804,4 +804,9 @@ public class TestMapUtils extends BulkTest {
         assertEquals(false, MapUtils.isNotEmpty(map));
     }
 
+
+    public void testPopulateMap() {
+        Map map = new HashMap();
+        
+    }
 }