commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r1148801 [4/5] - in /commons/proper/collections/trunk/src: java/org/apache/commons/collections/ java/org/apache/commons/collections/bag/ java/org/apache/commons/collections/bidimap/ java/org/apache/commons/collections/buffer/ java/org/apach...
Date Wed, 20 Jul 2011 14:45:30 GMT
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/TransformedSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/TransformedSet.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/TransformedSet.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/TransformedSet.java Wed Jul 20 14:44:46 2011
@@ -46,13 +46,13 @@ public class TransformedSet<E> extends T
      * <p>
      * If there are any elements already in the set being decorated, they
      * are NOT transformed.
-     * Constrast this with {@link #decorateTransform}.
+     * Contrast this with {@link #transformedSet(Set, Transformer)}.
      * 
      * @param set  the set to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
      * @throws IllegalArgumentException if set or transformer is null
      */
-    public static <E> Set<E> decorate(Set<E> set, Transformer<? super E, ? extends E> transformer) {
+    public static <E> Set<E> transformingSet(Set<E> set, Transformer<? super E, ? extends E> transformer) {
         return new TransformedSet<E>(set, transformer);
     }
     
@@ -62,7 +62,7 @@ public class TransformedSet<E> extends T
      * <p>
      * If there are any elements already in the set being decorated, they
      * will be transformed by this method.
-     * Constrast this with {@link #decorate}.
+     * Contrast this with {@link #transformingSet(Set, Transformer)}.
      * 
      * @param set  the set to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
@@ -70,7 +70,7 @@ public class TransformedSet<E> extends T
      * @throws IllegalArgumentException if set or transformer is null
      * @since Commons Collections 3.3
      */
-    public static <E> Set<E> decorateTransform(Set<E> set, Transformer<? super E, ? extends E> transformer) {
+    public static <E> Set<E> transformedSet(Set<E> set, Transformer<? super E, ? extends E> transformer) {
         TransformedSet<E> decorated = new TransformedSet<E>(set, transformer);
         if (transformer != null && set != null && set.size() > 0) {
             @SuppressWarnings("unchecked") // set is type E

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/TransformedSortedSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/TransformedSortedSet.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/TransformedSortedSet.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/TransformedSortedSet.java Wed Jul 20 14:44:46 2011
@@ -46,13 +46,13 @@ public class TransformedSortedSet<E> ext
      * <p>
      * If there are any elements already in the set being decorated, they
      * are NOT transformed.
-     * Constrast this with {@link #decorateTransform}.
+     * Contrast this with {@link #transformedSortedSet(SortedSet, Transformer)}.
      * 
      * @param set  the set to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
      * @throws IllegalArgumentException if set or transformer is null
      */
-    public static <E> SortedSet<E> decorate(SortedSet<E> set, Transformer<? super E, ? extends E> transformer) {
+    public static <E> SortedSet<E> transformingSortedSet(SortedSet<E> set, Transformer<? super E, ? extends E> transformer) {
         return new TransformedSortedSet<E>(set, transformer);
     }
     
@@ -62,7 +62,7 @@ public class TransformedSortedSet<E> ext
      * <p>
      * If there are any elements already in the set being decorated, they
      * will be transformed by this method.
-     * Constrast this with {@link #decorate}.
+     * Contrast this with {@link #transformingSortedSet(SortedSet, Transformer)}.
      * 
      * @param set  the set to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
@@ -70,7 +70,7 @@ public class TransformedSortedSet<E> ext
      * @throws IllegalArgumentException if set or transformer is null
      * @since Commons Collections 3.3
      */
-    public static <E> SortedSet<E> decorateTransform(SortedSet<E> set, Transformer<? super E, ? extends E> transformer) {
+    public static <E> SortedSet<E> transformedSortedSet(SortedSet<E> set, Transformer<? super E, ? extends E> transformer) {
         TransformedSortedSet<E> decorated = new TransformedSortedSet<E>(set, transformer);
         if (transformer != null && set != null && set.size() > 0) {
             @SuppressWarnings("unchecked") // set is type E

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSet.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSet.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSet.java Wed Jul 20 14:44:46 2011
@@ -48,7 +48,7 @@ public final class UnmodifiableSet<E>
      * @param set  the set to decorate, must not be null
      * @throws IllegalArgumentException if set is null
      */
-    public static <E> Set<E> decorate(Set<E> set) {
+    public static <E> Set<E> unmodifiableSet(Set<E> set) {
         if (set instanceof Unmodifiable) {
             return set;
         }
@@ -69,7 +69,7 @@ public final class UnmodifiableSet<E>
     //-----------------------------------------------------------------------
     @Override
     public Iterator<E> iterator() {
-        return UnmodifiableIterator.<E>decorate(decorated().iterator());
+        return UnmodifiableIterator.<E>unmodifiableIterator(decorated().iterator());
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java Wed Jul 20 14:44:46 2011
@@ -52,7 +52,7 @@ public final class UnmodifiableSortedSet
      * @param set  the set to decorate, must not be null
      * @throws IllegalArgumentException if set is null
      */
-    public static <T> SortedSet<T> decorate(SortedSet<T> set) {
+    public static <T> SortedSet<T> unmodifiableSortedSet(SortedSet<T> set) {
         if (set instanceof Unmodifiable) {
             return set;
         }
@@ -98,7 +98,7 @@ public final class UnmodifiableSortedSet
     //-----------------------------------------------------------------------
     @Override
     public Iterator<E> iterator() {
-        return UnmodifiableIterator.decorate(decorated().iterator());
+        return UnmodifiableIterator.unmodifiableIterator(decorated().iterator());
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java Wed Jul 20 14:44:46 2011
@@ -29,8 +29,7 @@ import org.apache.commons.collections.ma
  * {@link IterableGet} that uses a {@link Map}<K, V> for the {@link Get}<K, V>
  * implementation.
  *
- * @since Commons Collections 5
- * @TODO fix version
+ * @since Commons Collections 4.0
  * @version $Revision$ $Date$
  *
  * @author Matt Benson

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/SplitMapUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/SplitMapUtils.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/SplitMapUtils.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/SplitMapUtils.java Wed Jul 20 14:44:46 2011
@@ -37,8 +37,7 @@ import org.apache.commons.collections.se
  * Utilities for working with "split maps:" objects that implement {@link Put}
  * and/or {@link Get} but not {@link Map}.
  *
- * @since Commons Collections 5
- * @TODO fix version
+ * @since Commons Collections 4.0
  * @version $Revision$ $Date$
  * @see Get
  * @see Put
@@ -53,7 +52,7 @@ public class SplitMapUtils {
     }
 
     private static class WrappedGet<K, V> implements IterableMap<K, V>, Unmodifiable {
-        private Get<K, V> get;
+        private final Get<K, V> get;
 
         private WrappedGet(Get<K, V> get) {
             this.get = get;
@@ -72,7 +71,7 @@ public class SplitMapUtils {
         }
 
         public Set<java.util.Map.Entry<K, V>> entrySet() {
-            return UnmodifiableEntrySet.decorate(get.entrySet());
+            return UnmodifiableEntrySet.unmodifiableEntrySet(get.entrySet());
         }
 
         @Override
@@ -97,7 +96,7 @@ public class SplitMapUtils {
         }
 
         public Set<K> keySet() {
-            return UnmodifiableSet.decorate(get.keySet());
+            return UnmodifiableSet.unmodifiableSet(get.keySet());
         }
 
         public V put(K key, V value) {
@@ -117,7 +116,7 @@ public class SplitMapUtils {
         }
 
         public Collection<V> values() {
-            return UnmodifiableCollection.decorate(get.values());
+            return UnmodifiableCollection.unmodifiableCollection(get.values());
         }
 
         public MapIterator<K, V> mapIterator() {
@@ -127,12 +126,12 @@ public class SplitMapUtils {
             } else {
                 it = new EntrySetToMapIteratorAdapter<K, V>(get.entrySet());
             }
-            return UnmodifiableMapIterator.decorate(it);
+            return UnmodifiableMapIterator.unmodifiableMapIterator(it);
         }
     }
 
     private static class WrappedPut<K, V> implements Map<K, V>, Put<K, V> {
-        private Put<K, V> put;
+        private final Put<K, V> put;
 
         private WrappedPut(Put<K, V> put) {
             this.put = put;

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/TransformedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/TransformedMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/TransformedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/splitmap/TransformedMap.java Wed Jul 20 14:44:46 2011
@@ -49,13 +49,14 @@ import org.apache.commons.collections.ma
  * In practice this would often mean <code>&gt;Object, Object&gt;</code>, defeating
  * much of the usefulness of having parameterized types.
  * <p>
- * On the downside, this class is not a drop-in replacement for {@link java.util.Map}
+ * On the downside, this class is not drop-in compatible with {@link java.util.Map}
  * but is intended to be worked with either directly or by {@link Put} and {@link Get}
  * generalizations.
  *
- * @since Commons Collections 5
- * @TODO fix version
+ * @since Commons Collections 4.0
  * @version $Revision$ $Date$
+ * @see SplitMapUtils#readableMap(Get)
+ * @see SplitMapUtils#writableMap(Put)
  *
  * @author Stephen Colebourne
  * @author Matt Benson
@@ -84,7 +85,7 @@ public class TransformedMap<J, K, U, V> 
      * means no transformation
      * @throws IllegalArgumentException if map is null
      */
-    public static <J, K, U, V> TransformedMap<J, K, U, V> decorate(Map<K, V> map,
+    public static <J, K, U, V> TransformedMap<J, K, U, V> transformingMap(Map<K, V> map,
             Transformer<? super J, ? extends K> keyTransformer,
             Transformer<? super U, ? extends V> valueTransformer) {
         return new TransformedMap<J, K, U, V>(map, keyTransformer, valueTransformer);

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestBagUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestBagUtils.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestBagUtils.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestBagUtils.java Wed Jul 20 14:44:46 2011
@@ -99,17 +99,17 @@ public class TestBagUtils extends BulkTe
     }
 
      public void testTransformedBag() {
-        Bag<Object> bag = BagUtils.transformedBag(new HashBag<Object>(), nopTransformer);
+        Bag<Object> bag = BagUtils.transformingBag(new HashBag<Object>(), nopTransformer);
         assertTrue("Returned object should be an TransformedBag.",
             bag instanceof TransformedBag);
         try {
-            bag = BagUtils.transformedBag(null, nopTransformer);
+            bag = BagUtils.transformingBag(null, nopTransformer);
             fail("Expecting IllegalArgumentException for null bag.");
         } catch (IllegalArgumentException ex) {
             // expected
         }
         try {
-            bag = BagUtils.transformedBag(new HashBag<Object>(), null);
+            bag = BagUtils.transformingBag(new HashBag<Object>(), null);
             fail("Expecting IllegalArgumentException for null transformer.");
         } catch (IllegalArgumentException ex) {
             // expected
@@ -159,17 +159,17 @@ public class TestBagUtils extends BulkTe
     }
 
     public void testTransformedSortedBag() {
-        Bag<Object> bag = BagUtils.transformedSortedBag(new TreeBag<Object>(), nopTransformer);
+        Bag<Object> bag = BagUtils.transformingSortedBag(new TreeBag<Object>(), nopTransformer);
         assertTrue("Returned object should be an TransformedSortedBag",
             bag instanceof TransformedSortedBag);
         try {
-            bag = BagUtils.transformedSortedBag(null, nopTransformer);
+            bag = BagUtils.transformingSortedBag(null, nopTransformer);
             fail("Expecting IllegalArgumentException for null bag.");
         } catch (IllegalArgumentException ex) {
             // expected
         }
         try {
-            bag = BagUtils.transformedSortedBag(new TreeBag<Object>(), null);
+            bag = BagUtils.transformingSortedBag(new TreeBag<Object>(), null);
             fail("Expecting IllegalArgumentException for null transformer.");
         } catch (IllegalArgumentException ex) {
             // expected

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java Wed Jul 20 14:44:46 2011
@@ -1261,16 +1261,16 @@ public class TestCollectionUtils extends
     @Test
     public void testTransformedCollection() {
         Transformer<Object, Object> transformer = TransformerUtils.nopTransformer();
-        Collection<Object> collection = CollectionUtils.transformedCollection(new ArrayList<Object>(), transformer);
+        Collection<Object> collection = CollectionUtils.transformingCollection(new ArrayList<Object>(), transformer);
         assertTrue("returned object should be a TransformedCollection", collection instanceof TransformedCollection);
         try {
-            collection = CollectionUtils.transformedCollection(new ArrayList<Object>(), null);
+            collection = CollectionUtils.transformingCollection(new ArrayList<Object>(), null);
             fail("Expecting IllegalArgumentException for null transformer.");
         } catch (IllegalArgumentException ex) {
             // expected
         }
         try {
-            collection = CollectionUtils.transformedCollection(null, transformer);
+            collection = CollectionUtils.transformingCollection(null, transformer);
             fail("Expecting IllegalArgumentException for null collection.");
         } catch (IllegalArgumentException ex) {
             // expected
@@ -1283,7 +1283,7 @@ public class TestCollectionUtils extends
         list.add("1");
         list.add("2");
         list.add("3");
-        Collection<Object> result = CollectionUtils.transformedCollection(list, TRANSFORM_TO_INTEGER);
+        Collection<Object> result = CollectionUtils.transformingCollection(list, TRANSFORM_TO_INTEGER);
         assertEquals(true, result.contains("1")); // untransformed
         assertEquals(true, result.contains("2")); // untransformed
         assertEquals(true, result.contains("3")); // untransformed

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java Wed Jul 20 14:44:46 2011
@@ -50,7 +50,7 @@ public class TestPredicatedBag<T> extend
     protected Predicate<T> truePredicate = TruePredicate.<T>truePredicate();
 
     protected Bag<T> decorateBag(HashBag<T> bag, Predicate<T> predicate) {
-        return PredicatedBag.decorate(bag, predicate);
+        return PredicatedBag.predicatedBag(bag, predicate);
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java Wed Jul 20 14:44:46 2011
@@ -52,7 +52,7 @@ public class TestPredicatedSortedBag<T> 
     protected Predicate<T> truePredicate = TruePredicate.<T>truePredicate();
 
     protected SortedBag<T> decorateBag(SortedBag<T> bag, Predicate<T> predicate) {
-        return PredicatedSortedBag.decorate(bag, predicate);
+        return PredicatedSortedBag.predicatedSortedBag(bag, predicate);
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java Wed Jul 20 14:44:46 2011
@@ -38,13 +38,13 @@ public class TestTransformedBag<T> exten
     @Override
     @SuppressWarnings("unchecked")
     public Bag<T> makeObject() {
-        return TransformedBag.decorate(new HashBag<T>(), (Transformer<T, T>) TestTransformedCollection.NOOP_TRANSFORMER);
+        return TransformedBag.transformingBag(new HashBag<T>(), (Transformer<T, T>) TestTransformedCollection.NOOP_TRANSFORMER);
     }
 
     @SuppressWarnings("unchecked")
     public void testTransformedBag() {
         //T had better be Object!
-        Bag<T> bag = TransformedBag.decorate(new HashBag<T>(), (Transformer<T, T>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        Bag<T> bag = TransformedBag.transformingBag(new HashBag<T>(), (Transformer<T, T>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, bag.size());
         Object[] els = new Object[] {"1", "3", "5", "7", "2", "4", "6"};
         for (int i = 0; i < els.length; i++) {
@@ -65,7 +65,7 @@ public class TestTransformedBag<T> exten
         for (int i = 0; i < els.length; i++) {
             originalBag.add(els[i]);
         }
-        Bag bag = TransformedBag.decorateTransform(originalBag, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        Bag bag = TransformedBag.transformedBag(originalBag, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(els.length, bag.size());
         for (int i = 0; i < els.length; i++) {
             assertEquals(true, bag.contains(new Integer((String) els[i])));

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java Wed Jul 20 14:44:46 2011
@@ -39,12 +39,12 @@ public class TestTransformedSortedBag<T>
     @Override
     @SuppressWarnings("unchecked")
     public SortedBag<T> makeObject() {
-        return TransformedSortedBag.decorate(new TreeBag<T>(), (Transformer<T, T>) TestTransformedCollection.NOOP_TRANSFORMER);
+        return TransformedSortedBag.transformingSortedBag(new TreeBag<T>(), (Transformer<T, T>) TestTransformedCollection.NOOP_TRANSFORMER);
     }
 
     @SuppressWarnings("unchecked")
     public void testTransformedBag() {
-        SortedBag<T> bag = TransformedSortedBag.decorate(new TreeBag<T>(), (Transformer<T, T>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        SortedBag<T> bag = TransformedSortedBag.transformingSortedBag(new TreeBag<T>(), (Transformer<T, T>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, bag.size());
         Object[] els = new Object[] {"1", "3", "5", "7", "2", "4", "6"};
         for (int i = 0; i < els.length; i++) {
@@ -63,7 +63,7 @@ public class TestTransformedSortedBag<T>
         for (int i = 0; i < els.length; i++) {
             originalBag.add(els[i]);
         }
-        Bag<?> bag = TransformedBag.decorateTransform(originalBag, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        Bag<?> bag = TransformedBag.transformedBag(originalBag, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(els.length, bag.size());
         for (int i = 0; i < els.length; i++) {
             assertEquals(true, bag.contains(new Integer((String) els[i])));

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java Wed Jul 20 14:44:46 2011
@@ -56,13 +56,13 @@ public class TestDualTreeBidiMap2<K exte
     @Override
     public DualTreeBidiMap<K, V> makeObject() {
         return new DualTreeBidiMap<K, V>(
-                new ReverseComparator<K>(ComparableComparator.<K> getInstance()),
-                new ReverseComparator<V>(ComparableComparator.<V> getInstance()));
+                new ReverseComparator<K>(ComparableComparator.<K> comparableComparator()),
+                new ReverseComparator<V>(ComparableComparator.<V> comparableComparator()));
     }
 
     @Override
     public TreeMap<K, V> makeConfirmedMap() {
-        return new TreeMap<K, V>(new ReverseComparator<K>(ComparableComparator.<K>getInstance()));
+        return new TreeMap<K, V>(new ReverseComparator<K>(ComparableComparator.<K>comparableComparator()));
     }
 
     public void testComparator() {
@@ -132,7 +132,7 @@ public class TestDualTreeBidiMap2<K exte
 
         // Sort by the comparator used in the makeEmptyBidiMap() method
         List<K> newSortedKeys = getAsList(getSampleKeys());
-        Collections.sort(newSortedKeys, new ReverseComparator<K>(ComparableComparator.<K>getInstance()));
+        Collections.sort(newSortedKeys, new ReverseComparator<K>(ComparableComparator.<K>comparableComparator()));
         newSortedKeys = Collections.unmodifiableList(newSortedKeys);
 
         Iterator<K> mapIter = sm.keySet().iterator();

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java Wed Jul 20 14:44:46 2011
@@ -42,14 +42,14 @@ public class TestUnmodifiableBidiMap<K, 
 
     @Override
     public BidiMap<K, V> makeObject() {
-        return UnmodifiableBidiMap.decorate(new DualHashBidiMap<K, V>());
+        return UnmodifiableBidiMap.unmodifiableBidiMap(new DualHashBidiMap<K, V>());
     }
 
     @Override
     public BidiMap<K, V> makeFullMap() {
         BidiMap<K, V> bidi = new DualHashBidiMap<K, V>();
         addSampleMappings(bidi);
-        return UnmodifiableBidiMap.decorate(bidi);
+        return UnmodifiableBidiMap.unmodifiableBidiMap(bidi);
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java Wed Jul 20 14:44:46 2011
@@ -43,14 +43,14 @@ public class TestUnmodifiableOrderedBidi
 
     @Override
     public OrderedBidiMap<K, V> makeObject() {
-        return UnmodifiableOrderedBidiMap.decorate(new TreeBidiMap<K, V>());
+        return UnmodifiableOrderedBidiMap.unmodifiableOrderedBidiMap(new TreeBidiMap<K, V>());
     }
 
     @Override
     public BidiMap<K, V> makeFullMap() {
         OrderedBidiMap<K, V> bidi = new TreeBidiMap<K, V>();
         addSampleMappings(bidi);
-        return UnmodifiableOrderedBidiMap.decorate(bidi);
+        return UnmodifiableOrderedBidiMap.unmodifiableOrderedBidiMap(bidi);
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java Wed Jul 20 14:44:46 2011
@@ -43,14 +43,14 @@ public class TestUnmodifiableSortedBidiM
     //-----------------------------------------------------------------------
     @Override
     public SortedBidiMap<K, V> makeObject() {
-        return UnmodifiableSortedBidiMap.decorate(new DualTreeBidiMap<K, V>());
+        return UnmodifiableSortedBidiMap.unmodifiableSortedBidiMap(new DualTreeBidiMap<K, V>());
     }
 
     @Override
     public SortedBidiMap<K, V> makeFullMap() {
         SortedBidiMap<K, V> bidi = new DualTreeBidiMap<K, V>();
         addSampleMappings(bidi);
-        return UnmodifiableSortedBidiMap.decorate(bidi);
+        return UnmodifiableSortedBidiMap.unmodifiableSortedBidiMap(bidi);
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java Wed Jul 20 14:44:46 2011
@@ -43,7 +43,7 @@ public class TestBlockingBuffer<E> exten
 
     @Override
     public Buffer<E> makeObject() {
-        return BlockingBuffer.decorate(new MyBuffer<E>());
+        return BlockingBuffer.blockingBuffer(new MyBuffer<E>());
     }
 
     @Override
@@ -72,7 +72,7 @@ public class TestBlockingBuffer<E> exten
     }
 
     public void testGetWithAddTimeout() {
-        Buffer<E> blockingBuffer = BlockingBuffer.decorate(new MyBuffer<E>(), 500);
+        Buffer<E> blockingBuffer = BlockingBuffer.blockingBuffer(new MyBuffer<E>(), 500);
         E obj = makeElement();
         new DelayedAdd<E>(blockingBuffer, obj, 100).start();
 
@@ -96,7 +96,7 @@ public class TestBlockingBuffer<E> exten
     }
 
     public void testGetWithAddAllTimeout() {
-        Buffer<E> blockingBuffer = BlockingBuffer.decorate(new MyBuffer<E>(), 500);
+        Buffer<E> blockingBuffer = BlockingBuffer.blockingBuffer(new MyBuffer<E>(), 500);
         E obj = makeElement();
         new DelayedAddAll<E>(blockingBuffer, obj, 100).start();
 
@@ -120,7 +120,7 @@ public class TestBlockingBuffer<E> exten
     }
 
     public void testRemoveWithAddTimeout() {
-        Buffer<E> blockingBuffer = BlockingBuffer.decorate(new MyBuffer<E>(), 100);
+        Buffer<E> blockingBuffer = BlockingBuffer.blockingBuffer(new MyBuffer<E>(), 100);
         E obj = makeElement();
         new DelayedAdd<E>(blockingBuffer, obj, 500).start();
         try {
@@ -145,7 +145,7 @@ public class TestBlockingBuffer<E> exten
     }
 
     public void testRemoveWithAddAllTimeout() {
-        Buffer<E> blockingBuffer = BlockingBuffer.decorate(new MyBuffer<E>(), 100);
+        Buffer<E> blockingBuffer = BlockingBuffer.blockingBuffer(new MyBuffer<E>(), 100);
         E obj = makeElement();
         new DelayedAddAll<E>(blockingBuffer, obj, 500).start();
         try {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java Wed Jul 20 14:44:46 2011
@@ -43,13 +43,13 @@ public class TestBoundedBuffer<E> extend
 
     @Override
     public Buffer<E> makeObject() {
-        return BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), 1);
+        return BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), 1);
     }
 
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
     public void testMaxSize() {
-        final Buffer<E> bounded = BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), 2, 500);
+        final Buffer<E> bounded = BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), 2, 500);
         BoundedCollection<?> bc = (BoundedCollection<?>) bounded;
         assertEquals(2, bc.maxSize());
         assertEquals(false, bc.isFull());
@@ -60,11 +60,11 @@ public class TestBoundedBuffer<E> extend
         bounded.remove();
         assertEquals(false, bc.isFull());
         try {
-            BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), 0);
+            BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), 0);
             fail();
         } catch (IllegalArgumentException ex) {}
         try {
-            BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), -1);
+            BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), -1);
             fail();
         } catch (IllegalArgumentException ex) {}
     }
@@ -103,7 +103,7 @@ public class TestBoundedBuffer<E> extend
 
     @SuppressWarnings("unchecked")
     public void testAddToFullBufferRemoveViaIterator() {
-        final Buffer<E> bounded = BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), 1, 500);
+        final Buffer<E> bounded = BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), 1, 500);
         bounded.add((E) "Hello");
         new DelayedIteratorRemove(bounded, 200).start();
         bounded.add((E) "World");
@@ -114,7 +114,7 @@ public class TestBoundedBuffer<E> extend
 
     @SuppressWarnings("unchecked")
     public void testAddAllToFullBufferRemoveViaIterator() {
-        final Buffer<E> bounded = BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), 2, 500);
+        final Buffer<E> bounded = BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), 2, 500);
         bounded.add((E) "Hello");
         bounded.add((E) "World");
         new DelayedIteratorRemove(bounded, 200, 2).start();
@@ -126,7 +126,7 @@ public class TestBoundedBuffer<E> extend
 
     @SuppressWarnings("unchecked")
     public void testAddToFullBufferWithTimeout() {
-        final Buffer<E> bounded = BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), 1, 500);
+        final Buffer<E> bounded = BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), 1, 500);
         bounded.add((E) "Hello");
         new DelayedRemove(bounded, 200).start();
         bounded.add((E) "World");
@@ -141,7 +141,7 @@ public class TestBoundedBuffer<E> extend
 
     @SuppressWarnings("unchecked")
     public void testAddAllToFullBufferWithTimeout() {
-        final Buffer<E> bounded = BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), 2, 500);
+        final Buffer<E> bounded = BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), 2, 500);
         bounded.add((E) "Hello");
         bounded.add((E) "World");
         new DelayedRemove(bounded, 200, 2).start();

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java Wed Jul 20 14:44:46 2011
@@ -42,7 +42,7 @@ public class TestPredicatedBuffer<E> ext
     //---------------------------------------------------------------
 
     protected Buffer<E> decorateCollection(Buffer<E> buffer, Predicate<E> predicate) {
-        return PredicatedBuffer.decorate(buffer, predicate);
+        return PredicatedBuffer.predicatedBuffer(buffer, predicate);
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java Wed Jul 20 14:44:46 2011
@@ -42,14 +42,14 @@ public class TestSynchronizedBuffer<E> e
     //-----------------------------------------------------------------------
     @Override
     public Buffer<E> makeObject() {
-        return SynchronizedBuffer.decorate(new UnboundedFifoBuffer<E>());
+        return SynchronizedBuffer.synchronizedBuffer(new UnboundedFifoBuffer<E>());
     }
 
     @Override
     public Collection<E> makeFullCollection() {
         Buffer<E> buffer = new UnboundedFifoBuffer<E>();
         buffer.addAll(Arrays.asList(getFullElements()));
-        return SynchronizedBuffer.decorate(buffer);
+        return SynchronizedBuffer.synchronizedBuffer(buffer);
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java Wed Jul 20 14:44:46 2011
@@ -37,7 +37,7 @@ public class TestTransformedBuffer exten
     }
 
     public void testTransformedBuffer() {
-        Buffer<Object> buffer = TransformedBuffer.decorate(new ArrayStack<Object>(), TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        Buffer<Object> buffer = TransformedBuffer.transformingBuffer(new ArrayStack<Object>(), TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, buffer.size());
         Object[] els = new Object[] { "1", "3", "5", "7", "2", "4", "6" };
         for (int i = 0; i < els.length; i++) {
@@ -58,7 +58,7 @@ public class TestTransformedBuffer exten
         for (int i = 0; i < els.length; i++) {
             originalBuffer.add(els[i]);
         }
-        Buffer buffer = TransformedBuffer.decorateTransform(originalBuffer, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        Buffer buffer = TransformedBuffer.transformedBuffer(originalBuffer, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(els.length, buffer.size());
         for (int i = 0; i < els.length; i++) {
             assertEquals(true, buffer.contains(new Integer((String) els[i])));

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java Wed Jul 20 14:44:46 2011
@@ -42,14 +42,14 @@ public class TestUnmodifiableBuffer<E> e
     //-----------------------------------------------------------------------
     @Override
     public Collection<E> makeObject() {
-        return UnmodifiableBuffer.decorate(new UnboundedFifoBuffer<E>());
+        return UnmodifiableBuffer.unmodifiableBuffer(new UnboundedFifoBuffer<E>());
     }
 
     @Override
     public Collection<E> makeFullCollection() {
         Buffer<E> buffer = new UnboundedFifoBuffer<E>();
         buffer.addAll(Arrays.asList(getFullElements()));
-        return UnmodifiableBuffer.decorate(buffer);
+        return UnmodifiableBuffer.unmodifiableBuffer(buffer);
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java Wed Jul 20 14:44:46 2011
@@ -44,7 +44,7 @@ public class TestPredicatedCollection<E>
 
     protected Collection<E> decorateCollection(
                 Collection<E> collection, Predicate<E> predicate) {
-        return PredicatedCollection.decorate(collection, predicate);
+        return PredicatedCollection.predicatedCollection(collection, predicate);
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java Wed Jul 20 14:44:46 2011
@@ -39,7 +39,7 @@ public class TestSynchronizedCollection<
     //-----------------------------------------------------------------------
     @Override
     public Collection<E> makeObject() {
-        return SynchronizedCollection.decorate(new ArrayList<E>());
+        return SynchronizedCollection.synchronizedCollection(new ArrayList<E>());
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java Wed Jul 20 14:44:46 2011
@@ -63,14 +63,14 @@ public class TestTransformedCollection e
     
     @Override
     public Collection<Object> makeObject() {
-        return TransformedCollection.decorate(new ArrayList<Object>(), NOOP_TRANSFORMER);
+        return TransformedCollection.transformingCollection(new ArrayList<Object>(), NOOP_TRANSFORMER);
     }
 
     @Override
     public Collection<Object> makeFullCollection() {
         List<Object> list = new ArrayList<Object>();
         list.addAll(Arrays.asList(getFullElements()));
-        return TransformedCollection.decorate(list, NOOP_TRANSFORMER);
+        return TransformedCollection.transformingCollection(list, NOOP_TRANSFORMER);
     }
     
     //-----------------------------------------------------------------------
@@ -86,7 +86,7 @@ public class TestTransformedCollection e
 
     //-----------------------------------------------------------------------
     public void testTransformedCollection() {
-        Collection<Object> coll = TransformedCollection.decorate(new ArrayList<Object>(), STRING_TO_INTEGER_TRANSFORMER);
+        Collection<Object> coll = TransformedCollection.transformingCollection(new ArrayList<Object>(), STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, coll.size());
         Object[] els = getFullElements();
         for (int i = 0; i < els.length; i++) {
@@ -105,7 +105,7 @@ public class TestTransformedCollection e
         for (int i = 0; i < els.length; i++) {
             originalCollection.add(els[i]);
         }
-        Collection collection = TransformedCollection.decorateTransform(originalCollection, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        Collection collection = TransformedCollection.transformedCollection(originalCollection, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(els.length, collection.size());
         for (int i = 0; i < els.length; i++) {
             assertEquals(true, collection.contains(new Integer((String) els[i])));

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java Wed Jul 20 14:44:46 2011
@@ -40,14 +40,14 @@ public class TestUnmodifiableCollection<
     //-----------------------------------------------------------------------
     @Override
     public Collection<E> makeObject() {
-        return UnmodifiableCollection.decorate(new ArrayList<E>());
+        return UnmodifiableCollection.unmodifiableCollection(new ArrayList<E>());
     }
 
     @Override
     public Collection<E> makeFullCollection() {
         List<E> list = new ArrayList<E>();
         list.addAll(Arrays.asList(getFullElements()));
-        return UnmodifiableCollection.decorate(list);
+        return UnmodifiableCollection.unmodifiableCollection(list);
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java Wed Jul 20 14:44:46 2011
@@ -73,20 +73,20 @@ public class TestBooleanComparator exten
 
     public void testStaticFactoryMethods() {
         allTests(false,BooleanComparator.getFalseFirstComparator());
-        allTests(false,BooleanComparator.getBooleanComparator(false));
+        allTests(false,BooleanComparator.booleanComparator(false));
         allTests(true,BooleanComparator.getTrueFirstComparator());
-        allTests(true,BooleanComparator.getBooleanComparator(true));
+        allTests(true,BooleanComparator.booleanComparator(true));
     }
 
     public void testEqualsCompatibleInstance() {
         assertEquals(new BooleanComparator(),new BooleanComparator(false));
         assertEquals(new BooleanComparator(false),new BooleanComparator(false));
         assertEquals(new BooleanComparator(false),BooleanComparator.getFalseFirstComparator());
-        assertSame(BooleanComparator.getFalseFirstComparator(),BooleanComparator.getBooleanComparator(false));
+        assertSame(BooleanComparator.getFalseFirstComparator(),BooleanComparator.booleanComparator(false));
 
         assertEquals(new BooleanComparator(true),new BooleanComparator(true));
         assertEquals(new BooleanComparator(true),BooleanComparator.getTrueFirstComparator());
-        assertSame(BooleanComparator.getTrueFirstComparator(),BooleanComparator.getBooleanComparator(true));
+        assertSame(BooleanComparator.getTrueFirstComparator(),BooleanComparator.booleanComparator(true));
 
         assertTrue(!(new BooleanComparator().equals(new BooleanComparator(true))));
         assertTrue(!(new BooleanComparator(true).equals(new BooleanComparator(false))));

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestComparatorPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestComparatorPredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestComparatorPredicate.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestComparatorPredicate.java Wed Jul 20 14:44:46 2011
@@ -33,7 +33,7 @@ public class TestComparatorPredicate ext
     @Test
     public void compareEquals() {
         Integer value = Integer.valueOf(10);
-        Predicate<Integer> p = getInstance(value, new TestComparator<Integer>());
+        Predicate<Integer> p = comparatorPredicate(value, new TestComparator<Integer>());
         assertFalse(p, Integer.valueOf(value.intValue() - 1));
         assertTrue(p, Integer.valueOf(value.intValue()));
         assertFalse(p, Integer.valueOf(value.intValue() + 1));
@@ -42,7 +42,7 @@ public class TestComparatorPredicate ext
     @Test
     public void compareGreater() {
         Integer value = Integer.valueOf(10);
-        Predicate<Integer> p = getInstance(value, new TestComparator<Integer>(), Criterion.GREATER);
+        Predicate<Integer> p = comparatorPredicate(value, new TestComparator<Integer>(), Criterion.GREATER);
         assertTrue(p, Integer.valueOf(value.intValue() - 1));
         assertFalse(p, Integer.valueOf(value.intValue()));
         assertFalse(p, Integer.valueOf(value.intValue() + 1));
@@ -51,7 +51,7 @@ public class TestComparatorPredicate ext
     @Test
     public void compareLess() {
         Integer value = Integer.valueOf(10);
-        Predicate<Integer> p = getInstance(value, new TestComparator<Integer>(), Criterion.LESS);
+        Predicate<Integer> p = comparatorPredicate(value, new TestComparator<Integer>(), Criterion.LESS);
         assertFalse(p, Integer.valueOf(value.intValue() - 1));
         assertFalse(p, Integer.valueOf(value.intValue()));
         assertTrue(p, Integer.valueOf(value.intValue() + 1));
@@ -60,7 +60,7 @@ public class TestComparatorPredicate ext
     @Test
     public void compareGreaterOrEqual() {
         Integer value = Integer.valueOf(10);
-        Predicate<Integer> p = getInstance(value, new TestComparator<Integer>(), Criterion.GREATER_OR_EQUAL);
+        Predicate<Integer> p = comparatorPredicate(value, new TestComparator<Integer>(), Criterion.GREATER_OR_EQUAL);
         assertTrue(p, Integer.valueOf(value.intValue() - 1));
         assertTrue(p, Integer.valueOf(value.intValue()));
         assertFalse(p, Integer.valueOf(value.intValue() + 1));
@@ -69,7 +69,7 @@ public class TestComparatorPredicate ext
     @Test
     public void compareLessOrEqual() {
         Integer value = Integer.valueOf(10);
-        Predicate<Integer> p = getInstance(value, new TestComparator<Integer>(), Criterion.LESS_OR_EQUAL);
+        Predicate<Integer> p = comparatorPredicate(value, new TestComparator<Integer>(), Criterion.LESS_OR_EQUAL);
         assertFalse(p, Integer.valueOf(value.intValue() - 1));
         assertTrue(p, Integer.valueOf(value.intValue()));
         assertTrue(p, Integer.valueOf(value.intValue() + 1));
@@ -77,6 +77,6 @@ public class TestComparatorPredicate ext
     
     @Override
     protected Predicate<?> generatePredicate() {
-        return getInstance(Integer.valueOf(10), new TestComparator<Integer>());
+        return comparatorPredicate(Integer.valueOf(10), new TestComparator<Integer>());
     }    
 }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java Wed Jul 20 14:44:46 2011
@@ -145,7 +145,7 @@ public class TestFilterIterator<E> exten
         assertEquals(true, filterIterator.hasNext());
 
         // this predicate doesn't match
-        filterIterator.setPredicate(NotNullPredicate.getInstance());
+        filterIterator.setPredicate(NotNullPredicate.notNullPredicate());
         assertEquals(false, filterIterator.hasNext());
     }
 

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java Wed Jul 20 14:44:46 2011
@@ -52,12 +52,12 @@ public class TestUnmodifiableIterator<E>
 
     @Override
     public Iterator<E> makeEmptyIterator() {
-        return UnmodifiableIterator.decorate(Collections.<E>emptyList().iterator());
+        return UnmodifiableIterator.unmodifiableIterator(Collections.<E>emptyList().iterator());
     }
 
     @Override
     public Iterator<E> makeObject() {
-        return UnmodifiableIterator.decorate(testList.iterator());
+        return UnmodifiableIterator.unmodifiableIterator(testList.iterator());
     }
 
     @Override
@@ -72,13 +72,13 @@ public class TestUnmodifiableIterator<E>
 
     public void testDecorateFactory() {
         Iterator<E> it = makeObject();
-        assertSame(it, UnmodifiableIterator.decorate(it));
+        assertSame(it, UnmodifiableIterator.unmodifiableIterator(it));
 
         it = testList.iterator();
-        assertTrue(it != UnmodifiableIterator.decorate(it));
+        assertTrue(it != UnmodifiableIterator.unmodifiableIterator(it));
 
         try {
-            UnmodifiableIterator.decorate(null);
+            UnmodifiableIterator.unmodifiableIterator(null);
             fail();
         } catch (IllegalArgumentException ex) {}
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java Wed Jul 20 14:44:46 2011
@@ -52,12 +52,12 @@ public class TestUnmodifiableListIterato
 
     @Override
     public ListIterator<E> makeEmptyIterator() {
-        return UnmodifiableListIterator.decorate(Collections.<E>emptyList().listIterator());
+        return UnmodifiableListIterator.umodifiableListIterator(Collections.<E>emptyList().listIterator());
     }
 
     @Override
     public ListIterator<E> makeObject() {
-        return UnmodifiableListIterator.decorate(testList.listIterator());
+        return UnmodifiableListIterator.umodifiableListIterator(testList.listIterator());
     }
 
     @Override
@@ -82,13 +82,13 @@ public class TestUnmodifiableListIterato
 
     public void testDecorateFactory() {
         ListIterator<E> it = makeObject();
-        assertSame(it, UnmodifiableListIterator.decorate(it));
+        assertSame(it, UnmodifiableListIterator.umodifiableListIterator(it));
 
         it = testList.listIterator();
-        assertTrue(it != UnmodifiableListIterator.decorate(it));
+        assertTrue(it != UnmodifiableListIterator.umodifiableListIterator(it));
 
         try {
-            UnmodifiableListIterator.decorate(null);
+            UnmodifiableListIterator.umodifiableListIterator(null);
             fail();
         } catch (IllegalArgumentException ex) {}
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java Wed Jul 20 14:44:46 2011
@@ -39,12 +39,12 @@ public class TestUnmodifiableMapIterator
 
     @Override
     public MapIterator<K, V> makeEmptyIterator() {
-        return UnmodifiableMapIterator.decorate(new DualHashBidiMap<K, V>().mapIterator());
+        return UnmodifiableMapIterator.unmodifiableMapIterator(new DualHashBidiMap<K, V>().mapIterator());
     }
 
     @Override
     public MapIterator<K, V> makeObject() {
-        return UnmodifiableMapIterator.decorate(getMap().mapIterator());
+        return UnmodifiableMapIterator.unmodifiableMapIterator(getMap().mapIterator());
     }
 
     @Override
@@ -84,13 +84,13 @@ public class TestUnmodifiableMapIterator
 
     public void testDecorateFactory() {
         MapIterator<K, V> it = makeObject();
-        assertSame(it, UnmodifiableMapIterator.decorate(it));
+        assertSame(it, UnmodifiableMapIterator.unmodifiableMapIterator(it));
 
         it = getMap().mapIterator() ;
-        assertTrue(it != UnmodifiableMapIterator.decorate(it));
+        assertTrue(it != UnmodifiableMapIterator.unmodifiableMapIterator(it));
 
         try {
-            UnmodifiableMapIterator.decorate(null);
+            UnmodifiableMapIterator.unmodifiableMapIterator(null);
             fail();
         } catch (IllegalArgumentException ex) {}
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java Wed Jul 20 14:44:46 2011
@@ -40,19 +40,19 @@ public class TestUnmodifiableOrderedMapI
 
     @Override
     public OrderedMapIterator<K, V> makeEmptyIterator() {
-        return UnmodifiableOrderedMapIterator.decorate(
-                ListOrderedMap.decorate(new HashMap<K, V>()).mapIterator());
+        return UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(
+                ListOrderedMap.listOrderedMap(new HashMap<K, V>()).mapIterator());
     }
 
     @Override
     public OrderedMapIterator<K, V> makeObject() {
-        return UnmodifiableOrderedMapIterator.decorate(getMap().mapIterator());
+        return UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(getMap().mapIterator());
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public OrderedMap<K, V> getMap() {
-        OrderedMap<K, V> testMap = ListOrderedMap.decorate(new HashMap<K, V>());
+        OrderedMap<K, V> testMap = ListOrderedMap.listOrderedMap(new HashMap<K, V>());
         testMap.put((K) "A", (V) "a");
         testMap.put((K) "B", (V) "b");
         testMap.put((K) "C", (V) "c");
@@ -86,13 +86,13 @@ public class TestUnmodifiableOrderedMapI
 
     public void testDecorateFactory() {
         OrderedMapIterator<K, V> it = makeObject();
-        assertSame(it, UnmodifiableOrderedMapIterator.decorate(it));
+        assertSame(it, UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(it));
 
         it = getMap().mapIterator() ;
-        assertTrue(it != UnmodifiableOrderedMapIterator.decorate(it));
+        assertTrue(it != UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(it));
 
         try {
-            UnmodifiableOrderedMapIterator.decorate(null);
+            UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(null);
             fail();
         } catch (IllegalArgumentException ex) {}
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestFixedSizeList.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestFixedSizeList.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestFixedSizeList.java Wed Jul 20 14:44:46 2011
@@ -37,14 +37,14 @@ public class TestFixedSizeList<E> extend
 
     @Override
     public List<E> makeObject() {
-        return FixedSizeList.decorate(new ArrayList<E>());
+        return FixedSizeList.fixedSizeList(new ArrayList<E>());
     }
 
     @Override
     public List<E> makeFullCollection() {
         List<E> list = new ArrayList<E>();
         list.addAll(Arrays.asList(getFullElements()));
-        return FixedSizeList.decorate(list);
+        return FixedSizeList.fixedSizeList(list);
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java Wed Jul 20 14:44:46 2011
@@ -44,7 +44,7 @@ public class TestGrowthList<E> extends A
     public List<E> makeFullCollection() {
         List<E> list = new ArrayList<E>();
         list.addAll(Arrays.asList(getFullElements()));
-        return GrowthList.decorate(list);
+        return GrowthList.growthList(list);
     }
 
     //-----------------------------------------------------------------------

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestPredicatedList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestPredicatedList.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestPredicatedList.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestPredicatedList.java Wed Jul 20 14:44:46 2011
@@ -42,7 +42,7 @@ public class TestPredicatedList<E> exten
     protected Predicate<E> truePredicate = TruePredicate.<E>truePredicate();
 
     protected List<E> decorateList(List<E> list, Predicate<E> predicate) {
-        return PredicatedList.decorate(list, predicate);
+        return PredicatedList.predicatedList(list, predicate);
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSetUniqueList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSetUniqueList.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSetUniqueList.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSetUniqueList.java Wed Jul 20 14:44:46 2011
@@ -214,7 +214,7 @@ public class TestSetUniqueList<E> extend
     public void testFactory() {
         Integer[] array = new Integer[] { new Integer(1), new Integer(2), new Integer(1) };
         ArrayList<Integer> list = new ArrayList<Integer>(Arrays.asList(array));
-        final SetUniqueList<Integer> lset = SetUniqueList.decorate(list);
+        final SetUniqueList<Integer> lset = SetUniqueList.setUniqueList(list);
 
         assertEquals("Duplicate element was added.", 2, lset.size());
         assertEquals(new Integer(1), lset.get(0));
@@ -311,7 +311,7 @@ public class TestSetUniqueList<E> extend
 
     @SuppressWarnings("unchecked")
     public void testUniqueListReInsert() {
-        List<E> l = SetUniqueList.decorate(new LinkedList<E>());
+        List<E> l = SetUniqueList.setUniqueList(new LinkedList<E>());
         l.add((E) new Object());
         l.add((E) new Object());
 
@@ -328,7 +328,7 @@ public class TestSetUniqueList<E> extend
 
     @SuppressWarnings("unchecked")
     public void testUniqueListDoubleInsert() {
-        List<E> l = SetUniqueList.decorate(new LinkedList<E>());
+        List<E> l = SetUniqueList.setUniqueList(new LinkedList<E>());
         l.add((E) new Object());
         l.add((E) new Object());
 
@@ -458,7 +458,7 @@ public class TestSetUniqueList<E> extend
     // TODO: Generics
     public void testCollections304() {
         List list = new LinkedList();
-        SetUniqueList decoratedList = SetUniqueList.decorate(list);
+        SetUniqueList decoratedList = SetUniqueList.setUniqueList(list);
         String s1 = "Apple";
         String s2 = "Lemon";
         String s3 = "Orange";
@@ -486,7 +486,7 @@ public class TestSetUniqueList<E> extend
     @SuppressWarnings("unchecked")
     public void testCollections307() {
         List<E> list = new ArrayList<E>();
-        List<E> uniqueList = SetUniqueList.decorate(list);
+        List<E> uniqueList = SetUniqueList.setUniqueList(list);
 
         String hello = "Hello";
         String world = "World";

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSynchronizedList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSynchronizedList.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSynchronizedList.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSynchronizedList.java Wed Jul 20 14:44:46 2011
@@ -41,7 +41,7 @@ public class TestSynchronizedList<E> ext
 
     @Override
     public List<E> makeObject() {
-        return SynchronizedList.decorate(new ArrayList<E>());
+        return SynchronizedList.synchronizedList(new ArrayList<E>());
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestTransformedList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestTransformedList.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestTransformedList.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestTransformedList.java Wed Jul 20 14:44:46 2011
@@ -54,7 +54,7 @@ public class TestTransformedList<E> exte
     @Override
     @SuppressWarnings("unchecked")
     public List<E> makeObject() {
-        return TransformedList.decorate(new ArrayList<E>(), (Transformer<E, E>) TestTransformedCollection.NOOP_TRANSFORMER);
+        return TransformedList.transformingList(new ArrayList<E>(), (Transformer<E, E>) TestTransformedCollection.NOOP_TRANSFORMER);
     }
 
     @Override
@@ -62,12 +62,12 @@ public class TestTransformedList<E> exte
     public List<E> makeFullCollection() {
         List<E> list = new ArrayList<E>();
         list.addAll(Arrays.asList(getFullElements()));
-        return TransformedList.decorate(list, (Transformer<E, E>) TestTransformedCollection.NOOP_TRANSFORMER);
+        return TransformedList.transformingList(list, (Transformer<E, E>) TestTransformedCollection.NOOP_TRANSFORMER);
     }
 
     @SuppressWarnings("unchecked")
     public void testTransformedList() {
-        List<E> list = TransformedList.decorate(new ArrayList<E>(), (Transformer<E, E>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        List<E> list = TransformedList.transformingList(new ArrayList<E>(), (Transformer<E, E>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, list.size());
         E[] els = (E[]) new Object[] {"1", "3", "5", "7", "2", "4", "6"};
         for (int i = 0; i < els.length; i++) {
@@ -119,7 +119,7 @@ public class TestTransformedList<E> exte
         for (int i = 0; i < els.length; i++) {
             originalList.add(els[i]);
         }
-        List list = TransformedList.decorateTransform(originalList, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        List list = TransformedList.transformedList(originalList, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(els.length, list.size());
         for (int i = 0; i < els.length; i++) {
             assertEquals(true, list.contains(new Integer((String) els[i])));

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java Wed Jul 20 14:44:46 2011
@@ -45,7 +45,7 @@ public class TestDefaultedMap<K, V> exte
     //-----------------------------------------------------------------------
     @Override
     public IterableMap<K, V> makeObject() {
-        return DefaultedMap.decorate(new HashMap<K, V>(), nullFactory);
+        return DefaultedMap.defaultedMap(new HashMap<K, V>(), nullFactory);
     }
 
     //-----------------------------------------------------------------------
@@ -69,7 +69,7 @@ public class TestDefaultedMap<K, V> exte
     @SuppressWarnings("unchecked")
     public void testMapGet2() {
         HashMap<K, V> base = new HashMap<K, V>();
-        Map<K, V> map = DefaultedMap.decorate(base, (V) "NULL");
+        Map<K, V> map = DefaultedMap.defaultedMap(base, (V) "NULL");
 
         assertEquals(0, map.size());
         assertEquals(0, base.size());
@@ -88,7 +88,7 @@ public class TestDefaultedMap<K, V> exte
     @SuppressWarnings("unchecked")
     public void testMapGet3() {
         HashMap<K, V> base = new HashMap<K, V>();
-        Map<K, V> map = DefaultedMap.decorate(base, ConstantFactory.getInstance((V) "NULL"));
+        Map<K, V> map = DefaultedMap.defaultedMap(base, ConstantFactory.constantFactory((V) "NULL"));
 
         assertEquals(0, map.size());
         assertEquals(0, base.size());
@@ -107,7 +107,7 @@ public class TestDefaultedMap<K, V> exte
     @SuppressWarnings("unchecked")
     public void testMapGet4() {
         HashMap<K, V> base = new HashMap<K, V>();
-        Map<K, V> map = DefaultedMap.decorate(base, new Transformer<K, V>() {
+        Map<K, V> map = DefaultedMap.defaultedMap(base, new Transformer<K, V>() {
             public V transform(K input) {
                 if (input instanceof String) {
                     return (V) "NULL";

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java Wed Jul 20 14:44:46 2011
@@ -38,14 +38,14 @@ public class TestFixedSizeMap<K, V> exte
 
     @Override
     public IterableMap<K, V> makeObject() {
-        return FixedSizeMap.decorate(new HashMap<K, V>());
+        return FixedSizeMap.fixedSizeMap(new HashMap<K, V>());
     }
 
     @Override
     public IterableMap<K, V> makeFullMap() {
         Map<K, V> map = new HashMap<K, V>();
         addSampleMappings(map);
-        return FixedSizeMap.decorate(map);
+        return FixedSizeMap.fixedSizeMap(map);
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java Wed Jul 20 14:44:46 2011
@@ -45,14 +45,14 @@ public class TestFixedSizeSortedMap<K, V
     //-----------------------------------------------------------------------
     @Override
     public SortedMap<K, V> makeObject() {
-        return FixedSizeSortedMap.decorate(new TreeMap<K, V>());
+        return FixedSizeSortedMap.fixedSizeSortedMap(new TreeMap<K, V>());
     }
 
     @Override
     public SortedMap<K, V> makeFullMap() {
         SortedMap<K, V> map = new TreeMap<K, V>();
         addSampleMappings(map);
-        return FixedSizeSortedMap.decorate(map);
+        return FixedSizeSortedMap.fixedSizeSortedMap(map);
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java Wed Jul 20 14:44:46 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.collections.map;
 
-import static org.apache.commons.collections.map.LazyMap.getLazyMap;
+import static org.apache.commons.collections.map.LazyMap.lazyMap;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -46,7 +46,7 @@ public class TestLazyMap<K, V> extends A
 
     @Override
     public LazyMap<K,V> makeObject() {
-        return getLazyMap(new HashMap<K,V>(), FactoryUtils.<V>nullFactory());
+        return lazyMap(new HashMap<K,V>(), FactoryUtils.<V>nullFactory());
     }
 
     //-----------------------------------------------------------------------
@@ -57,7 +57,7 @@ public class TestLazyMap<K, V> extends A
 
     @Test
     public void mapGetWithFactory() {
-        Map<Integer, Number> map = getLazyMap(new HashMap<Integer,Number>(), oneFactory);
+        Map<Integer, Number> map = lazyMap(new HashMap<Integer,Number>(), oneFactory);
         assertEquals(0, map.size());
         Number i1 = map.get("Five");
         assertEquals(1, i1);
@@ -67,7 +67,7 @@ public class TestLazyMap<K, V> extends A
         assertEquals(1, map.size());
         assertSame(i1, i2);
 
-        map = getLazyMap(new HashMap<Integer,Number>(), FactoryUtils.<Long>nullFactory());
+        map = lazyMap(new HashMap<Integer,Number>(), FactoryUtils.<Long>nullFactory());
         Object o = map.get("Five");
         assertEquals(null,o);
         assertEquals(1, map.size());
@@ -80,7 +80,7 @@ public class TestLazyMap<K, V> extends A
                 return input.intValue();
             }
         };
-        Map<Long, Number> map = getLazyMap(new HashMap<Long,Number>(), intConverter );
+        Map<Long, Number> map = lazyMap(new HashMap<Long,Number>(), intConverter );
         assertEquals(0, map.size());
         Number i1 = map.get(123L);
         assertEquals(123, i1);

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java Wed Jul 20 14:44:46 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.collections.map;
 
-import static org.apache.commons.collections.map.LazySortedMap.getLazySortedMap;
+import static org.apache.commons.collections.map.LazySortedMap.lazySortedMap;
 
 import java.util.Comparator;
 import java.util.Map;
@@ -49,7 +49,7 @@ public class TestLazySortedMap<K, V> ext
     
     @Override
     public SortedMap<K,V> makeObject() {
-        return getLazySortedMap(new TreeMap<K,V>(), FactoryUtils.<V>nullFactory());
+        return lazySortedMap(new TreeMap<K,V>(), FactoryUtils.<V>nullFactory());
     }
     
     @Override
@@ -72,13 +72,13 @@ public class TestLazySortedMap<K, V> ext
     
     @Test
     public void mapGet() {
-        Map<Integer, Number> map = getLazySortedMap(new TreeMap<Integer,Number>(), oneFactory);
+        Map<Integer, Number> map = lazySortedMap(new TreeMap<Integer,Number>(), oneFactory);
         assertEquals(0, map.size());
         Number i1 = map.get(5);
         assertEquals(1, i1);
         assertEquals(1, map.size());
 
-        map = getLazySortedMap(new TreeMap<Integer,Number>(), FactoryUtils.<Number>nullFactory());
+        map = lazySortedMap(new TreeMap<Integer,Number>(), FactoryUtils.<Number>nullFactory());
         Number o = map.get(5);
         assertEquals(null,o);
         assertEquals(1, map.size());
@@ -87,7 +87,7 @@ public class TestLazySortedMap<K, V> ext
     
     //-----------------------------------------------------------------------
     public void testSortOrder() {
-        SortedMap<String, Number> map = getLazySortedMap(new TreeMap<String,Number>(), oneFactory);
+        SortedMap<String, Number> map = lazySortedMap(new TreeMap<String,Number>(), oneFactory);
         map.put("A",  5);
         map.get("B"); // Entry with value "One" created
         map.put("C", 8);
@@ -107,16 +107,16 @@ public class TestLazySortedMap<K, V> ext
     
     public void testTransformerDecorate() {
         Transformer<Object, Integer> transformer = TransformerUtils.asTransformer(oneFactory);
-        SortedMap<Integer, Number> map = getLazySortedMap(new TreeMap<Integer, Number>(), transformer);     
+        SortedMap<Integer, Number> map = lazySortedMap(new TreeMap<Integer, Number>(), transformer);     
         assertTrue(map instanceof LazySortedMap);  
          try {
-            map = getLazySortedMap(new TreeMap<Integer, Number>(), (Transformer<Integer, Number>) null);
+            map = lazySortedMap(new TreeMap<Integer, Number>(), (Transformer<Integer, Number>) null);
             fail("Expecting IllegalArgumentException for null transformer");
         } catch (IllegalArgumentException e) {
             // expected
         }
         try {
-            map = getLazySortedMap((SortedMap<Integer,Number>) null, transformer);
+            map = lazySortedMap((SortedMap<Integer,Number>) null, transformer);
             fail("Expecting IllegalArgumentException for null map");
         } catch (IllegalArgumentException e) {
             // expected

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap.java Wed Jul 20 14:44:46 2011
@@ -49,7 +49,7 @@ public class TestListOrderedMap<K, V> ex
 
     @Override
     public ListOrderedMap<K, V> makeObject() {
-        return (ListOrderedMap<K, V>) ListOrderedMap.decorate(new HashMap<K, V>());
+        return (ListOrderedMap<K, V>) ListOrderedMap.listOrderedMap(new HashMap<K, V>());
     }
 
     /**

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java Wed Jul 20 14:44:46 2011
@@ -419,7 +419,7 @@ public class TestMultiKeyMap<K, V> exten
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
     public void testLRUMultiKeyMap() {
-        MultiKeyMap<K, V> map = MultiKeyMap.decorate(new LRUMap<MultiKey<? extends K>, V>(2));
+        MultiKeyMap<K, V> map = MultiKeyMap.multiKeyMap(new LRUMap<MultiKey<? extends K>, V>(2));
         map.put((K) I1, (K) I2, (V) "1-2");
         map.put((K) I1, (K) I3, (V) "1-1");
         assertEquals(2, map.size());

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java Wed Jul 20 14:44:46 2011
@@ -109,7 +109,7 @@ public class TestMultiValueMap<K, V> ext
 
     @SuppressWarnings("unchecked")
     private <C extends Collection<V>> MultiValueMap<K, V> createTestMap(Class<C> collectionClass) {
-        final MultiValueMap<K, V> map = MultiValueMap.decorate(new HashMap<K, C>(), collectionClass);
+        final MultiValueMap<K, V> map = MultiValueMap.multiValueMap(new HashMap<K, C>(), collectionClass);
         map.put((K) "one", (V) "uno");
         map.put((K) "one", (V) "un");
         map.put((K) "two", (V) "dos");
@@ -254,7 +254,7 @@ public class TestMultiValueMap<K, V> ext
 
     @SuppressWarnings("unchecked")
     public void testPutWithList() {
-        MultiValueMap<K, V> test = MultiValueMap.decorate(new HashMap<K, Collection>(), ArrayList.class);
+        MultiValueMap<K, V> test = MultiValueMap.multiValueMap(new HashMap<K, Collection>(), ArrayList.class);
         assertEquals("a", test.put((K) "A", "a"));
         assertEquals("b", test.put((K) "A", "b"));
         assertEquals(1, test.size());
@@ -264,7 +264,7 @@ public class TestMultiValueMap<K, V> ext
 
     @SuppressWarnings("unchecked")
     public void testPutWithSet() {
-        MultiValueMap<K, V> test = MultiValueMap.decorate(new HashMap<K, HashSet>(), HashSet.class);
+        MultiValueMap<K, V> test = MultiValueMap.multiValueMap(new HashMap<K, HashSet>(), HashSet.class);
         assertEquals("a", test.put((K) "A", "a"));
         assertEquals("b", test.put((K) "A", "b"));
         assertEquals(null, test.put((K) "A", "a"));

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java Wed Jul 20 14:44:46 2011
@@ -50,7 +50,7 @@ public class TestPredicatedMap<K, V> ext
     //-----------------------------------------------------------------------
     protected IterableMap<K, V> decorateMap(Map<K, V> map, Predicate<? super K> keyPredicate,
         Predicate<? super V> valuePredicate) {
-        return PredicatedMap.decorate(map, keyPredicate, valuePredicate);
+        return PredicatedMap.predicatedMap(map, keyPredicate, valuePredicate);
     }
 
     @Override



Mime
View raw message