commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r1148801 [2/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/bag/TransformedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TransformedBag.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TransformedBag.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/TransformedBag.java Wed Jul 20 14:44:46 2011
@@ -49,14 +49,14 @@ public class TransformedBag<E>
      * <p>
      * If there are any elements already in the bag being decorated, they
      * are NOT transformed.
-     * Constrast this with {@link #decorateTransform}.
+     * Contrast this with {@link #transformedBag(Bag, Transformer)}.
      * 
      * @param bag  the bag to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
      * @return a new transformed Bag
      * @throws IllegalArgumentException if bag or transformer is null
      */
-    public static <E> Bag<E> decorate(Bag<E> bag, Transformer<? super E, ? extends E> transformer) {
+    public static <E> Bag<E> transformingBag(Bag<E> bag, Transformer<? super E, ? extends E> transformer) {
         return new TransformedBag<E>(bag, transformer);
     }
     
@@ -66,7 +66,7 @@ public class TransformedBag<E>
      * <p>
      * If there are any elements already in the bag being decorated, they
      * will be transformed by this method.
-     * Constrast this with {@link #decorate}.
+     * Contrast this with {@link #transformingBag(Bag, Transformer)}.
      * 
      * @param bag  the bag to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
@@ -74,13 +74,13 @@ public class TransformedBag<E>
      * @throws IllegalArgumentException if bag or transformer is null
      * @since Commons Collections 3.3
      */
-    public static <E> Bag<E> decorateTransform(Bag<E> bag, Transformer<? super E, ? extends E> transformer) {
+    public static <E> Bag<E> transformedBag(Bag<E> bag, Transformer<? super E, ? extends E> transformer) {
         TransformedBag<E> decorated = new TransformedBag<E>(bag, transformer);
         if (transformer != null && bag != null && bag.size() > 0) {
             @SuppressWarnings("unchecked") // Bag is of type E
             E[] values = (E[]) bag.toArray();
             bag.clear();
-            for(int i=0; i<values.length; i++) {
+			for (int i = 0; i < values.length; i++) {
                 decorated.decorated().add(transformer.transform(values[i]));
             }
         }
@@ -127,7 +127,7 @@ public class TransformedBag<E>
 
     public Set<E> uniqueSet() {
         Set<E> set = getBag().uniqueSet();
-        return TransformedSet.<E>decorate(set, transformer);
+        return TransformedSet.<E>transformingSet(set, transformer);
     }
 
 }

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

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java Wed Jul 20 14:44:46 2011
@@ -56,7 +56,7 @@ public final class UnmodifiableBag<E>
      * @return an unmodifiable Bag
      * @throws IllegalArgumentException if bag is null
      */
-    public static <E> Bag<E> decorate(Bag<E> bag) {
+    public static <E> Bag<E> unmodifiableBag(Bag<E> bag) {
         if (bag instanceof Unmodifiable) {
             return bag;
         }
@@ -102,7 +102,8 @@ public final class UnmodifiableBag<E>
     //-----------------------------------------------------------------------
     @Override
     public Iterator<E> iterator() {
-        return UnmodifiableIterator.<E>decorate(decorated().iterator());
+		return UnmodifiableIterator.<E> unmodifiableIterator(decorated()
+				.iterator());
     }
 
     @Override
@@ -149,7 +150,7 @@ public final class UnmodifiableBag<E>
     @Override
     public Set<E> uniqueSet() {
         Set<E> set = decorated().uniqueSet();
-        return UnmodifiableSet.<E>decorate(set);
+		return UnmodifiableSet.<E> unmodifiableSet(set);
     }
 
 }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java Wed Jul 20 14:44:46 2011
@@ -56,7 +56,7 @@ public final class UnmodifiableSortedBag
      * @return an unmodifiable SortedBag
      * @throws IllegalArgumentException if bag is null
      */
-    public static <E> SortedBag<E> decorate(SortedBag<E> bag) {
+    public static <E> SortedBag<E> unmodifiableSortedBag(SortedBag<E> bag) {
         if (bag instanceof Unmodifiable) {
             return bag;
         }
@@ -102,7 +102,7 @@ public final class UnmodifiableSortedBag
     //-----------------------------------------------------------------------
     @Override
     public Iterator<E> iterator() {
-        return UnmodifiableIterator.decorate(decorated().iterator());
+        return UnmodifiableIterator.unmodifiableIterator(decorated().iterator());
     }
 
     @Override
@@ -149,7 +149,7 @@ public final class UnmodifiableSortedBag
     @Override
     public Set<E> uniqueSet() {
         Set<E> set = decorated().uniqueSet();
-        return UnmodifiableSet.decorate(set);
+        return UnmodifiableSet.unmodifiableSet(set);
     }
 
 }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java Wed Jul 20 14:44:46 2011
@@ -422,7 +422,7 @@ public class TreeBidiMap<K extends Compa
      */
     public OrderedMapIterator<K, V> mapIterator() {
         if (isEmpty()) {
-            return EmptyOrderedMapIterator.<K, V>getInstance();
+            return EmptyOrderedMapIterator.<K, V>emptyOrderedMapIterator();
         }
         return new ViewMapIterator(KEY);
     }
@@ -2110,7 +2110,7 @@ public class TreeBidiMap<K extends Compa
 
         public OrderedMapIterator<V, K> mapIterator() {
             if (isEmpty()) {
-                return EmptyOrderedMapIterator.<V, K>getInstance();
+                return EmptyOrderedMapIterator.<V, K>emptyOrderedMapIterator();
             }
             return new InverseViewMapIterator(VALUE);
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java Wed Jul 20 14:44:46 2011
@@ -53,7 +53,7 @@ public final class UnmodifiableBidiMap<K
      * @return an unmodifiable BidiMap
      * @throws IllegalArgumentException if map is null
      */
-    public static <K, V> BidiMap<K, V> decorate(BidiMap<K, V> map) {
+    public static <K, V> BidiMap<K, V> unmodifiableBidiMap(BidiMap<K, V> map) {
         if (map instanceof Unmodifiable) {
             return map;
         }
@@ -95,19 +95,19 @@ public final class UnmodifiableBidiMap<K
     @Override
     public Set<Map.Entry<K, V>> entrySet() {
         Set<Map.Entry<K, V>> set = super.entrySet();
-        return UnmodifiableEntrySet.decorate(set);
+        return UnmodifiableEntrySet.unmodifiableEntrySet(set);
     }
 
     @Override
     public Set<K> keySet() {
         Set<K> set = super.keySet();
-        return UnmodifiableSet.decorate(set);
+        return UnmodifiableSet.unmodifiableSet(set);
     }
 
     @Override
     public Collection<V> values() {
         Collection<V> coll = super.values();
-        return UnmodifiableCollection.decorate(coll);
+        return UnmodifiableCollection.unmodifiableCollection(coll);
     }
 
     //-----------------------------------------------------------------------
@@ -119,7 +119,7 @@ public final class UnmodifiableBidiMap<K
     @Override
     public MapIterator<K, V> mapIterator() {
         MapIterator<K, V> it = decorated().mapIterator();
-        return UnmodifiableMapIterator.decorate(it);
+        return UnmodifiableMapIterator.unmodifiableMapIterator(it);
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java Wed Jul 20 14:44:46 2011
@@ -53,7 +53,7 @@ public final class UnmodifiableOrderedBi
      * @return an unmodifiable OrderedBidiMap
      * @throws IllegalArgumentException if map is null
      */
-    public static <K, V> OrderedBidiMap<K, V> decorate(OrderedBidiMap<K, V> map) {
+    public static <K, V> OrderedBidiMap<K, V> unmodifiableOrderedBidiMap(OrderedBidiMap<K, V> map) {
         if (map instanceof Unmodifiable) {
             return map;
         }
@@ -95,19 +95,19 @@ public final class UnmodifiableOrderedBi
     @Override
     public Set<Map.Entry<K, V>> entrySet() {
         Set<Map.Entry<K, V>> set = super.entrySet();
-        return UnmodifiableEntrySet.decorate(set);
+        return UnmodifiableEntrySet.unmodifiableEntrySet(set);
     }
 
     @Override
     public Set<K> keySet() {
         Set<K> set = super.keySet();
-        return UnmodifiableSet.decorate(set);
+        return UnmodifiableSet.unmodifiableSet(set);
     }
 
     @Override
     public Collection<V> values() {
         Collection<V> coll = super.values();
-        return UnmodifiableCollection.decorate(coll);
+        return UnmodifiableCollection.unmodifiableCollection(coll);
     }
 
     //-----------------------------------------------------------------------
@@ -125,7 +125,7 @@ public final class UnmodifiableOrderedBi
     @Override
     public OrderedMapIterator<K, V> mapIterator() {
         OrderedMapIterator<K, V> it = decorated().mapIterator();
-        return UnmodifiableOrderedMapIterator.decorate(it);
+        return UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(it);
     }
 
     public OrderedBidiMap<V, K> inverseOrderedBidiMap() {

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java Wed Jul 20 14:44:46 2011
@@ -55,7 +55,7 @@ public final class UnmodifiableSortedBid
      * @return an unmodifiable SortedBidiMap
      * @throws IllegalArgumentException if map is null
      */
-    public static <K, V> SortedBidiMap<K, V> decorate(SortedBidiMap<K, V> map) {
+    public static <K, V> SortedBidiMap<K, V> unmodifiableSortedBidiMap(SortedBidiMap<K, V> map) {
         if (map instanceof Unmodifiable) {
             return map;
         }
@@ -97,19 +97,19 @@ public final class UnmodifiableSortedBid
     @Override
     public Set<Map.Entry<K, V>> entrySet() {
         Set<Map.Entry<K, V>> set = super.entrySet();
-        return UnmodifiableEntrySet.decorate(set);
+        return UnmodifiableEntrySet.unmodifiableEntrySet(set);
     }
 
     @Override
     public Set<K> keySet() {
         Set<K> set = super.keySet();
-        return UnmodifiableSet.decorate(set);
+        return UnmodifiableSet.unmodifiableSet(set);
     }
 
     @Override
     public Collection<V> values() {
         Collection<V> coll = super.values();
-        return UnmodifiableCollection.decorate(coll);
+        return UnmodifiableCollection.unmodifiableCollection(coll);
     }
 
     //-----------------------------------------------------------------------
@@ -122,7 +122,7 @@ public final class UnmodifiableSortedBid
     @Override
     public OrderedMapIterator<K, V> mapIterator() {
         OrderedMapIterator<K, V> it = decorated().mapIterator();
-        return UnmodifiableOrderedMapIterator.decorate(it);
+        return UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(it);
     }
 
     //-----------------------------------------------------------------------
@@ -138,19 +138,19 @@ public final class UnmodifiableSortedBid
     @Override
     public SortedMap<K, V> subMap(K fromKey, K toKey) {
         SortedMap<K, V> sm = decorated().subMap(fromKey, toKey);
-        return UnmodifiableSortedMap.decorate(sm);
+        return UnmodifiableSortedMap.unmodifiableSortedMap(sm);
     }
 
     @Override
     public SortedMap<K, V> headMap(K toKey) {
         SortedMap<K, V> sm = decorated().headMap(toKey);
-        return UnmodifiableSortedMap.decorate(sm);
+        return UnmodifiableSortedMap.unmodifiableSortedMap(sm);
     }
 
     @Override
     public SortedMap<K, V> tailMap(K fromKey) {
         SortedMap<K, V> sm = decorated().tailMap(fromKey);
-        return UnmodifiableSortedMap.decorate(sm);
+        return UnmodifiableSortedMap.unmodifiableSortedMap(sm);
     }
 
 }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java Wed Jul 20 14:44:46 2011
@@ -64,7 +64,7 @@ public class BlockingBuffer<E> extends S
      * @return a new blocking Buffer
      * @throws IllegalArgumentException if buffer is null
      */
-    public static <T> Buffer<T> decorate(Buffer<T> buffer) {
+    public static <T> Buffer<T> blockingBuffer(Buffer<T> buffer) {
         return new BlockingBuffer<T>(buffer);
     }
 
@@ -77,7 +77,7 @@ public class BlockingBuffer<E> extends S
      * @throws IllegalArgumentException if the buffer is null
      * @since Commons Collections 3.2
      */
-    public static <T> Buffer<T> decorate(Buffer<T> buffer, long timeoutMillis) {
+    public static <T> Buffer<T> blockingBuffer(Buffer<T> buffer, long timeoutMillis) {
         return new BlockingBuffer<T>(buffer, timeoutMillis);
     }
 

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java Wed Jul 20 14:44:46 2011
@@ -67,7 +67,7 @@ public class BoundedBuffer<E> extends Sy
      * @throws IllegalArgumentException if the buffer is null
      * @throws IllegalArgumentException if the maximum size is zero or less
      */
-    public static <E> BoundedBuffer<E> decorate(Buffer<E> buffer, int maximumSize) {
+    public static <E> BoundedBuffer<E> boundedBuffer(Buffer<E> buffer, int maximumSize) {
         return new BoundedBuffer<E>(buffer, maximumSize, 0L);
     }
 
@@ -82,7 +82,7 @@ public class BoundedBuffer<E> extends Sy
      * @throws IllegalArgumentException if the buffer is null
      * @throws IllegalArgumentException if the maximum size is zero or less
      */
-    public static <E> BoundedBuffer<E> decorate(Buffer<E> buffer, int maximumSize, long timeout) {
+    public static <E> BoundedBuffer<E> boundedBuffer(Buffer<E> buffer, int maximumSize, long timeout) {
         return new BoundedBuffer<E>(buffer, maximumSize, timeout);
     }
 

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java Wed Jul 20 14:44:46 2011
@@ -56,7 +56,7 @@ public class PredicatedBuffer<E> extends
      * @throws IllegalArgumentException if buffer or predicate is null
      * @throws IllegalArgumentException if the buffer contains invalid elements
      */
-    public static <T> Buffer<T> decorate(Buffer<T> buffer, Predicate<? super T> predicate) {
+    public static <T> Buffer<T> predicatedBuffer(Buffer<T> buffer, Predicate<? super T> predicate) {
         return new PredicatedBuffer<T>(buffer, predicate);
     }
     

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java Wed Jul 20 14:44:46 2011
@@ -45,7 +45,7 @@ import org.apache.commons.collections.co
  * <p>
  * Note that this implementation is not synchronized.  Use 
  * {@link org.apache.commons.collections.BufferUtils#synchronizedBuffer(Buffer)} or
- * {@link org.apache.commons.collections.buffer.SynchronizedBuffer#decorate(Buffer)}
+ * {@link org.apache.commons.collections.buffer.SynchronizedBuffer#synchronizedBuffer(Buffer)}
  * to provide synchronized access to a <code>PriorityBuffer</code>:
  * <pre>
  * Buffer heap = SynchronizedBuffer.decorate(new PriorityBuffer());

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java Wed Jul 20 14:44:46 2011
@@ -48,7 +48,7 @@ public class SynchronizedBuffer<E>
      * @return a new synchronized Buffer
      * @throws IllegalArgumentException if buffer is null
      */
-    public static <T> Buffer<T> decorate(Buffer<T> buffer) {
+    public static <T> Buffer<T> synchronizedBuffer(Buffer<T> buffer) {
         return new SynchronizedBuffer<T>(buffer);
     }
 

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

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java Wed Jul 20 14:44:46 2011
@@ -55,7 +55,7 @@ public final class UnmodifiableBuffer<E>
      * @return an unmodifiable Buffer
      * @throws IllegalArgumentException if buffer is null
      */
-    public static <E> Buffer<E> decorate(Buffer<E> buffer) {
+    public static <E> Buffer<E> unmodifiableBuffer(Buffer<E> buffer) {
         if (buffer instanceof Unmodifiable) {
             return buffer;
         }
@@ -101,7 +101,7 @@ public final class UnmodifiableBuffer<E>
     //-----------------------------------------------------------------------
     @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/collection/CompositeCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/CompositeCollection.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/CompositeCollection.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/CompositeCollection.java Wed Jul 20 14:44:46 2011
@@ -163,7 +163,7 @@ public class CompositeCollection<E> impl
      */
     public Iterator<E> iterator() {
         if (all.isEmpty()) {
-            return EmptyIterator.<E>getInstance();
+            return EmptyIterator.<E>emptyIterator();
         }
         IteratorChain<E> chain = new IteratorChain<E>();
         for (Collection<? extends E> item : all) {
@@ -419,7 +419,7 @@ public class CompositeCollection<E> impl
      * @return Unmodifiable list of all collections in this composite.
      */
     public List<? extends Collection<E>> getCollections() {
-        return UnmodifiableList.decorate(all);
+        return UnmodifiableList.unmodifiableList(all);
     }
 
     /**

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/PredicatedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/PredicatedCollection.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/PredicatedCollection.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/PredicatedCollection.java Wed Jul 20 14:44:46 2011
@@ -61,7 +61,7 @@ public class PredicatedCollection<E> ext
      * @throws IllegalArgumentException if collection or predicate is null
      * @throws IllegalArgumentException if the collection contains invalid elements
      */
-    public static <T> Collection<T> decorate(Collection<T> coll, Predicate<? super T> predicate) {
+    public static <T> Collection<T> predicatedCollection(Collection<T> coll, Predicate<? super T> predicate) {
         return new PredicatedCollection<T>(coll, predicate);
     }
 

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java Wed Jul 20 14:44:46 2011
@@ -58,7 +58,7 @@ public class SynchronizedCollection<E> i
      * @return a new synchronized collection
      * @throws IllegalArgumentException if collection is null
      */
-    public static <T> Collection<T> decorate(Collection<T> coll) {
+    public static <T> Collection<T> synchronizedCollection(Collection<T> coll) {
         return new SynchronizedCollection<T>(coll);
     }
 

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/TransformedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/TransformedCollection.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/TransformedCollection.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/TransformedCollection.java Wed Jul 20 14:44:46 2011
@@ -51,14 +51,14 @@ public class TransformedCollection<E> ex
      * <p>
      * If there are any elements already in the collection being decorated, they
      * are NOT transformed.
-     * Constrast this with {@link #decorateTransform}.
+     * Contrast this with {@link #transformedCollection(Collection, Transformer)}.
      * 
      * @param coll  the collection to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
      * @return a new transformed collection
      * @throws IllegalArgumentException if collection or transformer is null
      */
-    public static <E> Collection<E> decorate(Collection<E> coll, Transformer<? super E, ? extends E> transformer) {
+    public static <E> Collection<E> transformingCollection(Collection<E> coll, Transformer<? super E, ? extends E> transformer) {
         return new TransformedCollection<E>(coll, transformer);
     }
 
@@ -68,7 +68,7 @@ public class TransformedCollection<E> ex
      * <p>
      * If there are any elements already in the collection being decorated, they
      * will be transformed by this method.
-     * Constrast this with {@link #decorate}.
+     * Contrast this with {@link #transformingCollection(Collection, Transformer)}.
      * 
      * @param collection  the collection to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
@@ -76,7 +76,7 @@ public class TransformedCollection<E> ex
      * @throws IllegalArgumentException if collection or transformer is null
      * @since Commons Collections 3.3
      */
-    public static <E> Collection<E> decorateTransform(Collection<E> collection, Transformer<? super E, ? extends E> transformer) {
+    public static <E> Collection<E> transformedCollection(Collection<E> collection, Transformer<? super E, ? extends E> transformer) {
         TransformedCollection<E> decorated = new TransformedCollection<E>(collection, transformer);
         // null collection & transformer are disallowed by the constructor call above 
         if (collection.size() > 0) {

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java Wed Jul 20 14:44:46 2011
@@ -54,8 +54,8 @@ public final class UnmodifiableBoundedCo
      * @return a new unmodifiable bounded collection
      * @throws IllegalArgumentException if bag is null
      */
-    public static <E> BoundedCollection<E> decorate(BoundedCollection<E> coll) {
-        return new UnmodifiableBoundedCollection<E>(coll);
+    public static <E> BoundedCollection<E> unmodifiableBoundedCollection(BoundedCollection<E> coll) {
+        return unmodifiableBoundedCollection(coll);
     }
 
     /**
@@ -69,7 +69,7 @@ public final class UnmodifiableBoundedCo
      * @throws IllegalArgumentException if bag is null
      */
     @SuppressWarnings("unchecked")
-    public static <E> BoundedCollection<E> decorateUsing(Collection<? super E> coll) {
+	public static <E> BoundedCollection<E> unmodifiableBoundedCollection(Collection<? extends E> coll) {
         if (coll == null) {
             throw new IllegalArgumentException("The collection must not be null");
         }
@@ -105,7 +105,7 @@ public final class UnmodifiableBoundedCo
     //-----------------------------------------------------------------------
     @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/collection/UnmodifiableCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java Wed Jul 20 14:44:46 2011
@@ -52,7 +52,7 @@ public final class UnmodifiableCollectio
      * @return an unmodifiable collection
      * @throws IllegalArgumentException if collection is null
      */
-    public static <T> Collection<T> decorate(Collection<T> coll) {
+    public static <T> Collection<T> unmodifiableCollection(Collection<T> coll) {
         if (coll instanceof Unmodifiable) {
             return coll;
         }
@@ -73,7 +73,7 @@ public final class UnmodifiableCollectio
     //-----------------------------------------------------------------------
     @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/comparators/BooleanComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/BooleanComparator.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/BooleanComparator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/BooleanComparator.java Wed Jul 20 14:44:46 2011
@@ -25,7 +25,7 @@ import java.util.Comparator;
  * <p>
  * @see #getTrueFirstComparator()
  * @see #getFalseFirstComparator()
- * @see #getBooleanComparator(boolean)
+ * @see #booleanComparator(boolean)
  *
  * @since Commons Collections 3.0
  * @version $Revision$ $Date$
@@ -94,7 +94,7 @@ public final class BooleanComparator imp
      * <code>true</code> <code>Boolean</code>s before <code>false</code>
      * @return a singleton BooleanComparator instance
      */
-    public static BooleanComparator getBooleanComparator(boolean trueFirst) {
+    public static BooleanComparator booleanComparator(boolean trueFirst) {
         return trueFirst ? TRUE_FIRST : FALSE_FIRST;
     }
 

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ComparableComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ComparableComparator.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ComparableComparator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/comparators/ComparableComparator.java Wed Jul 20 14:44:46 2011
@@ -60,7 +60,7 @@ public class ComparableComparator<E exte
      * @return the singleton ComparableComparator
      */
     @SuppressWarnings("unchecked")
-    public static <E extends Comparable<? super E>> ComparableComparator<E> getInstance() {
+    public static <E extends Comparable<? super E>> ComparableComparator<E> comparableComparator() {
         return (ComparableComparator<E>) INSTANCE;
     }
 
@@ -68,7 +68,7 @@ public class ComparableComparator<E exte
     /**
      * Constructor whose use should be avoided.
      * <p>
-     * Please use the {@link #getInstance()} method whenever possible.
+     * Please use the {@link #comparableComparator()} method whenever possible.
      */
     public ComparableComparator() {
         super();

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/AndPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/AndPredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/AndPredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/AndPredicate.java Wed Jul 20 14:44:46 2011
@@ -46,7 +46,7 @@ public final class AndPredicate<T> imple
      * @return the <code>and</code> predicate
      * @throws IllegalArgumentException if either predicate is null
      */
-    public static <T> Predicate<T> getInstance(Predicate<? super T> predicate1, Predicate<? super T> predicate2) {
+    public static <T> Predicate<T> andPredicate(Predicate<? super T> predicate1, Predicate<? super T> predicate2) {
         if (predicate1 == null || predicate2 == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/AnyPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/AnyPredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/AnyPredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/AnyPredicate.java Wed Jul 20 14:44:46 2011
@@ -55,7 +55,7 @@ public final class AnyPredicate<T> imple
      * @throws IllegalArgumentException if any predicate in the array is null
      */
     @SuppressWarnings("unchecked")
-    public static <T> Predicate<T> getInstance(Predicate<? super T>[] predicates) {
+    public static <T> Predicate<T> anyPredicate(Predicate<? super T>... predicates) {
         FunctorUtils.validate(predicates);
         if (predicates.length == 0) {
             return FalsePredicate.<T>falsePredicate();
@@ -78,7 +78,7 @@ public final class AnyPredicate<T> imple
      * @throws IllegalArgumentException if any predicate in the array is null
      */
     @SuppressWarnings("unchecked")
-    public static <T> Predicate<T> getInstance(Collection<? extends Predicate<T>> predicates) {
+    public static <T> Predicate<T> anyPredicate(Collection<? extends Predicate<T>> predicates) {
         Predicate<? super T>[] preds = FunctorUtils.validate(predicates);
         if (preds.length == 0) {
             return FalsePredicate.<T>falsePredicate();

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ChainedClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ChainedClosure.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ChainedClosure.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ChainedClosure.java Wed Jul 20 14:44:46 2011
@@ -45,10 +45,10 @@ public class ChainedClosure<E> implement
      * @throws IllegalArgumentException if the closures array is null
      * @throws IllegalArgumentException if any closure in the array is null
      */
-    public static <E> Closure<E> getInstance(Closure<? super E>[] closures) {
+    public static <E> Closure<E> chainedClosure(Closure<? super E>... closures) {
         FunctorUtils.validate(closures);
         if (closures.length == 0) {
-            return NOPClosure.<E>getInstance();
+            return NOPClosure.<E>nopClosure();
         }
         closures = FunctorUtils.copy(closures);
         return new ChainedClosure<E>(closures);
@@ -65,12 +65,12 @@ public class ChainedClosure<E> implement
      * @throws IllegalArgumentException if any closure in the collection is null
      */
     @SuppressWarnings("unchecked")
-    public static <E> Closure<E> getInstance(Collection<Closure<E>> closures) {
+    public static <E> Closure<E> chainedClosure(Collection<Closure<E>> closures) {
         if (closures == null) {
             throw new IllegalArgumentException("Closure collection must not be null");
         }
         if (closures.size() == 0) {
-            return NOPClosure.<E>getInstance();
+            return NOPClosure.<E>nopClosure();
         }
         // convert to array like this to guarantee iterator() ordering
         Closure<? super E>[] cmds = new Closure[closures.size()];
@@ -83,23 +83,6 @@ public class ChainedClosure<E> implement
     }
 
     /**
-     * Factory method that performs validation.
-     * 
-     * @param closure1  the first closure, not null
-     * @param closure2  the second closure, not null
-     * @return the <code>chained</code> closure
-     * @throws IllegalArgumentException if either closure is null
-     */
-    @SuppressWarnings("unchecked")
-    public static <E> Closure<E> getInstance(Closure<? super E> closure1, Closure<? super E> closure2) {
-        if (closure1 == null || closure2 == null) {
-            throw new IllegalArgumentException("Closures must not be null");
-        }
-        Closure<E>[] closures = new Closure[] { closure1, closure2 };
-        return new ChainedClosure<E>(closures);
-    }
-
-    /**
      * Constructor that performs no validation.
      * Use <code>getInstance</code> if you want that.
      * 

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ChainedTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ChainedTransformer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ChainedTransformer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ChainedTransformer.java Wed Jul 20 14:44:46 2011
@@ -48,10 +48,10 @@ public class ChainedTransformer<T> imple
      * @throws IllegalArgumentException if the transformers array is null
      * @throws IllegalArgumentException if any transformer in the array is null
      */
-    public static <T> Transformer<T, T> getInstance(Transformer<? super T, ? extends T>[] transformers) {
+    public static <T> Transformer<T, T> chainedTransformer(Transformer<? super T, ? extends T>... transformers) {
         FunctorUtils.validate(transformers);
         if (transformers.length == 0) {
-            return NOPTransformer.<T>getInstance();
+            return NOPTransformer.<T>nopTransformer();
         }
         transformers = FunctorUtils.copy(transformers);
         return new ChainedTransformer<T>(transformers);
@@ -68,12 +68,12 @@ public class ChainedTransformer<T> imple
      * @throws IllegalArgumentException if any transformer in the collection is null
      */
     @SuppressWarnings("unchecked")
-    public static <T> Transformer<T, T> getInstance(Collection<? extends Transformer<T, T>> transformers) {
+    public static <T> Transformer<T, T> chainedTransformer(Collection<? extends Transformer<T, T>> transformers) {
         if (transformers == null) {
             throw new IllegalArgumentException("Transformer collection must not be null");
         }
         if (transformers.size() == 0) {
-            return NOPTransformer.<T>getInstance();
+            return NOPTransformer.<T>nopTransformer();
         }
         // convert to array like this to guarantee iterator() ordering
         Transformer<T, T>[] cmds = transformers.toArray(new Transformer[transformers.size()]);
@@ -82,23 +82,6 @@ public class ChainedTransformer<T> imple
     }
 
     /**
-     * Factory method that performs validation.
-     * 
-     * @param transformer1  the first transformer, not null
-     * @param transformer2  the second transformer, not null
-     * @return the <code>chained</code> transformer
-     * @throws IllegalArgumentException if either transformer is null
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> Transformer<T, T> getInstance(Transformer<? super T, ? extends T> transformer1, Transformer<? super T, ? extends T> transformer2) {
-        if (transformer1 == null || transformer2 == null) {
-            throw new IllegalArgumentException("Transformers must not be null");
-        }
-        Transformer<? super T, ? extends T>[] transformers = new Transformer[] { transformer1, transformer2 };
-        return new ChainedTransformer<T>(transformers);
-    }
-
-    /**
      * Constructor that performs no validation.
      * Use <code>getInstance</code> if you want that.
      * 

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/CloneTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/CloneTransformer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/CloneTransformer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/CloneTransformer.java Wed Jul 20 14:44:46 2011
@@ -45,7 +45,7 @@ public class CloneTransformer<T> impleme
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <T> Transformer<T, T> getInstance() {
+    public static <T> Transformer<T, T> cloneTransformer() {
         return (Transformer<T, T>) INSTANCE;
     }
 
@@ -66,7 +66,7 @@ public class CloneTransformer<T> impleme
         if (input == null) {
             return null;
         }
-        return PrototypeFactory.getInstance(input).create();
+        return PrototypeFactory.prototypeFactory(input).create();
     }
 
     private Object readResolve() {

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ClosureTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ClosureTransformer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ClosureTransformer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ClosureTransformer.java Wed Jul 20 14:44:46 2011
@@ -45,7 +45,7 @@ public class ClosureTransformer<T> imple
      * @return the <code>closure</code> transformer
      * @throws IllegalArgumentException if the closure is null
      */
-    public static <T> Transformer<T, T> getInstance(Closure<? super T> closure) {
+    public static <T> Transformer<T, T> closureTransformer(Closure<? super T> closure) {
         if (closure == null) {
             throw new IllegalArgumentException("Closure must not be null");
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ComparatorPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ComparatorPredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ComparatorPredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ComparatorPredicate.java Wed Jul 20 14:44:46 2011
@@ -105,8 +105,8 @@ public class ComparatorPredicate<T> impl
      * @return the predicate
      * @throws IllegalArgumentException if comparator is null
      */
-    public static <T> Predicate<T> getInstance(T object, Comparator<T> comparator) {
-        return getInstance(object, comparator, Criterion.EQUAL);
+    public static <T> Predicate<T> comparatorPredicate(T object, Comparator<T> comparator) {
+        return comparatorPredicate(object, comparator, Criterion.EQUAL);
     }
 
     /**
@@ -118,7 +118,7 @@ public class ComparatorPredicate<T> impl
      * @return the predicate
      * @throws IllegalArgumentException if comparator is null of criterion is invalid
      */
-    public static <T> Predicate<T> getInstance(T object, Comparator<T> comparator, Criterion criterion) {
+    public static <T> Predicate<T> comparatorPredicate(T object, Comparator<T> comparator, Criterion criterion) {
         if (comparator == null) {
             throw new IllegalArgumentException("Comparator must not be null.");
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ConstantFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ConstantFactory.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ConstantFactory.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ConstantFactory.java Wed Jul 20 14:44:46 2011
@@ -50,7 +50,7 @@ public class ConstantFactory<T> implemen
      * @return the <code>constant</code> factory.
      */
     @SuppressWarnings("unchecked")
-    public static <T> Factory<T> getInstance(T constantToReturn) {
+    public static <T> Factory<T> constantFactory(T constantToReturn) {
         if (constantToReturn == null) {
             return (Factory<T>) NULL_INSTANCE;
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ConstantTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ConstantTransformer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ConstantTransformer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ConstantTransformer.java Wed Jul 20 14:44:46 2011
@@ -50,7 +50,7 @@ public class ConstantTransformer<I, O> i
      * @return Transformer<I, O> that always returns null.
      */
     @SuppressWarnings("unchecked")
-    public static <I, O> Transformer<I, O> getNullInstance() {
+    public static <I, O> Transformer<I, O> nullTransformer() {
         return (Transformer<I, O>) NULL_INSTANCE;
     }
 
@@ -60,9 +60,9 @@ public class ConstantTransformer<I, O> i
      * @param constantToReturn  the constant object to return each time in the factory
      * @return the <code>constant</code> factory.
      */
-    public static <I, O> Transformer<I, O> getInstance(O constantToReturn) {
+    public static <I, O> Transformer<I, O> constantTransformer(O constantToReturn) {
         if (constantToReturn == null) {
-            return getNullInstance();
+            return nullTransformer();
         }
         return new ConstantTransformer<I, O>(constantToReturn);
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/DefaultEquator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/DefaultEquator.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/DefaultEquator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/DefaultEquator.java Wed Jul 20 14:44:46 2011
@@ -60,7 +60,7 @@ public class DefaultEquator<T> implement
 	 * @return {@link DefaultEquator#INSTANCE}
 	 */
 	@SuppressWarnings("unchecked")
-	public static <T> DefaultEquator<T> instance() {
+	public static <T> DefaultEquator<T> defaultEquator() {
 		return (DefaultEquator<T>) DefaultEquator.INSTANCE;
 	}
 }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/EqualPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/EqualPredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/EqualPredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/EqualPredicate.java Wed Jul 20 14:44:46 2011
@@ -38,7 +38,7 @@ public final class EqualPredicate<T> imp
 
     /** The value to compare to */
     private final Object iValue;
-    
+
     /**
      * Factory to create the identity predicate.
      * 

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionClosure.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionClosure.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionClosure.java Wed Jul 20 14:44:46 2011
@@ -44,7 +44,7 @@ public final class ExceptionClosure<E> i
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <E> Closure<E> getInstance() {
+    public static <E> Closure<E> exceptionClosure() {
         return (Closure<E>) INSTANCE;
     }
 

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionFactory.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionFactory.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionFactory.java Wed Jul 20 14:44:46 2011
@@ -44,7 +44,7 @@ public final class ExceptionFactory<T> i
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <T> Factory<T> getInstance() {
+    public static <T> Factory<T> exceptionFactory() {
         return (Factory<T>) INSTANCE;
     }
 

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java Wed Jul 20 14:44:46 2011
@@ -44,7 +44,7 @@ public final class ExceptionPredicate<T>
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <T> Predicate<T> getInstance() {
+    public static <T> Predicate<T> exceptionPredicate() {
         return (Predicate<T>) INSTANCE;
     }
 

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java Wed Jul 20 14:44:46 2011
@@ -44,7 +44,7 @@ public final class ExceptionTransformer<
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <I, O> Transformer<I, O> getInstance() {
+    public static <I, O> Transformer<I, O> exceptionTransformer() {
         return (Transformer<I, O>) INSTANCE;
     }
 

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/FactoryTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/FactoryTransformer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/FactoryTransformer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/FactoryTransformer.java Wed Jul 20 14:44:46 2011
@@ -44,7 +44,7 @@ public class FactoryTransformer<I, O> im
      * @return the <code>factory</code> transformer
      * @throws IllegalArgumentException if the factory is null
      */
-    public static <I, O> Transformer<I, O> getInstance(Factory<? extends O> factory) {
+    public static <I, O> Transformer<I, O> factoryTransformer(Factory<? extends O> factory) {
         if (factory == null) {
             throw new IllegalArgumentException("Factory must not be null");
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/FalsePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/FalsePredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/FalsePredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/FalsePredicate.java Wed Jul 20 14:44:46 2011
@@ -40,7 +40,7 @@ public final class FalsePredicate<T> imp
      * Get a typed instance.
      *
      * @return the singleton instance
-     * @since Commons Collections 5
+     * @since Commons Collections 4.0
      */
     @SuppressWarnings("unchecked")
     public static <T> Predicate<T> falsePredicate() {

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ForClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ForClosure.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ForClosure.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/ForClosure.java Wed Jul 20 14:44:46 2011
@@ -49,9 +49,9 @@ public class ForClosure<E> implements Cl
      * @return the <code>for</code> closure
      */
     @SuppressWarnings("unchecked")
-    public static <E> Closure<E> getInstance(int count, Closure<? super E> closure) {
+    public static <E> Closure<E> forClosure(int count, Closure<? super E> closure) {
         if (count <= 0 || closure == null) {
-            return NOPClosure.<E>getInstance();
+            return NOPClosure.<E>nopClosure();
         }
         if (count == 1) {
             return (Closure<E>) closure;

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/IdentityPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/IdentityPredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/IdentityPredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/IdentityPredicate.java Wed Jul 20 14:44:46 2011
@@ -44,7 +44,7 @@ public final class IdentityPredicate<T> 
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Predicate<T> getInstance(T object) {
+    public static <T> Predicate<T> identityPredicate(T object) {
         if (object == null) {
             return NullPredicate.<T>nullPredicate();
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/IfClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/IfClosure.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/IfClosure.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/IfClosure.java Wed Jul 20 14:44:46 2011
@@ -55,8 +55,8 @@ public class IfClosure<E> implements Clo
      * @throws IllegalArgumentException if either argument is null
      * @since Commons Collections 3.2
      */
-    public static <E> Closure<E> getInstance(Predicate<? super E> predicate, Closure<? super E> trueClosure) {
-        return IfClosure.<E>getInstance(predicate, trueClosure, NOPClosure.<E>getInstance());
+    public static <E> Closure<E> ifClosure(Predicate<? super E> predicate, Closure<? super E> trueClosure) {
+        return IfClosure.<E>ifClosure(predicate, trueClosure, NOPClosure.<E>nopClosure());
     }
 
     /**
@@ -68,7 +68,7 @@ public class IfClosure<E> implements Clo
      * @return the <code>if</code> closure
      * @throws IllegalArgumentException if any argument is null
      */
-    public static <E> Closure<E> getInstance(Predicate<? super E> predicate, Closure<? super E> trueClosure, Closure<? super E> falseClosure) {
+    public static <E> Closure<E> ifClosure(Predicate<? super E> predicate, Closure<? super E> trueClosure, Closure<? super E> falseClosure) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java Wed Jul 20 14:44:46 2011
@@ -44,7 +44,7 @@ public final class InstanceofPredicate i
      * @return the predicate
      * @throws IllegalArgumentException if the class is null
      */
-    public static Predicate<Object> getInstance(Class<?> type) {
+    public static Predicate<Object> instanceOfPredicate(Class<?> type) {
         if (type == null) {
             throw new IllegalArgumentException("The type to check instanceof must not be null");
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstantiateFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstantiateFactory.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstantiateFactory.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstantiateFactory.java Wed Jul 20 14:44:46 2011
@@ -53,7 +53,7 @@ public class InstantiateFactory<T> imple
      * @param args  the constructor arguments
      * @return a new instantiate factory
      */
-    public static <T> Factory<T> getInstance(Class<T> classToInstantiate, Class<?>[] paramTypes, Object[] args) {
+    public static <T> Factory<T> instantiateFactory(Class<T> classToInstantiate, Class<?>[] paramTypes, Object[] args) {
         if (classToInstantiate == null) {
             throw new IllegalArgumentException("Class to instantiate must not be null");
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java Wed Jul 20 14:44:46 2011
@@ -49,7 +49,7 @@ public class InstantiateTransformer<T> i
      * @param <T>
      * @return Transformer<Class<? extends T>, T>
      */
-    public static <T> Transformer<Class<? extends T>, T> getInstance() {
+    public static <T> Transformer<Class<? extends T>, T> instantiateTransformer() {
         return new InstantiateTransformer<T>();
     }
 
@@ -60,7 +60,7 @@ public class InstantiateTransformer<T> i
      * @param args  the constructor arguments
      * @return an instantiate transformer
      */
-    public static <T> Transformer<Class<? extends T>, T> getInstance(Class<?>[] paramTypes, Object[] args) {
+    public static <T> Transformer<Class<? extends T>, T> instantiateTransformer(Class<?>[] paramTypes, Object[] args) {
         if (((paramTypes == null) && (args != null))
             || ((paramTypes != null) && (args == null))
             || ((paramTypes != null) && (args != null) && (paramTypes.length != args.length))) {

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InvokerTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InvokerTransformer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InvokerTransformer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InvokerTransformer.java Wed Jul 20 14:44:46 2011
@@ -50,7 +50,7 @@ public class InvokerTransformer<I, O> im
      * @return an invoker transformer
      * @since Commons Collections 3.1
      */
-    public static <I, O> Transformer<I, O> getInstance(String methodName) {
+    public static <I, O> Transformer<I, O> invokerTransformer(String methodName) {
         if (methodName == null) {
             throw new IllegalArgumentException("The method to invoke must not be null");
         }
@@ -65,7 +65,7 @@ public class InvokerTransformer<I, O> im
      * @param args  the arguments to pass to the method
      * @return an invoker transformer
      */
-    public static <I, O> Transformer<I, O> getInstance(String methodName, Class<?>[] paramTypes, Object[] args) {
+    public static <I, O> Transformer<I, O> invokerTransformer(String methodName, Class<?>[] paramTypes, Object[] args) {
         if (methodName == null) {
             throw new IllegalArgumentException("The method to invoke must not be null");
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/MapTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/MapTransformer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/MapTransformer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/MapTransformer.java Wed Jul 20 14:44:46 2011
@@ -46,9 +46,9 @@ public final class MapTransformer<I, O> 
      * @param map the map, not cloned
      * @return the transformer
      */
-    public static <I, O> Transformer<I, O> getInstance(Map<? super I, ? extends O> map) {
+    public static <I, O> Transformer<I, O> mapTransformer(Map<? super I, ? extends O> map) {
         if (map == null) {
-            return ConstantTransformer.<I, O>getNullInstance();
+            return ConstantTransformer.<I, O>nullTransformer();
         }
         return new MapTransformer<I, O>(map);
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NOPClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NOPClosure.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NOPClosure.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NOPClosure.java Wed Jul 20 14:44:46 2011
@@ -43,7 +43,7 @@ public final class NOPClosure<E> impleme
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <E> Closure<E> getInstance() {
+    public static <E> Closure<E> nopClosure() {
         return (Closure<E>) INSTANCE;
     }
 

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NOPTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NOPTransformer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NOPTransformer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NOPTransformer.java Wed Jul 20 14:44:46 2011
@@ -43,7 +43,7 @@ public class NOPTransformer<T> implement
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <T> Transformer<T, T> getInstance() {
+    public static <T> Transformer<T, T> nopTransformer() {
         return (Transformer<T, T>) INSTANCE;
     }
 

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NonePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NonePredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NonePredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NonePredicate.java Wed Jul 20 14:44:46 2011
@@ -53,7 +53,7 @@ public final class NonePredicate<T> impl
      * @throws IllegalArgumentException if the predicates array is null
      * @throws IllegalArgumentException if any predicate in the array is null
      */
-    public static <T> Predicate<T> getInstance(Predicate<? super T>[] predicates) {
+    public static <T> Predicate<T> nonePredicate(Predicate<? super T>... predicates) {
         FunctorUtils.validate(predicates);
         if (predicates.length == 0) {
             return TruePredicate.<T>truePredicate();
@@ -72,7 +72,7 @@ public final class NonePredicate<T> impl
      * @throws IllegalArgumentException if the predicates array is null
      * @throws IllegalArgumentException if any predicate in the array is null
      */
-    public static <T> Predicate<T> getInstance(Collection<? extends Predicate<T>> predicates) {
+    public static <T> Predicate<T> nonePredicate(Collection<? extends Predicate<T>> predicates) {
         Predicate<? super T>[] preds = FunctorUtils.validate(predicates);
         if (preds.length == 0) {
             return TruePredicate.<T>truePredicate();

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NotNullPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NotNullPredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NotNullPredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NotNullPredicate.java Wed Jul 20 14:44:46 2011
@@ -43,7 +43,7 @@ public final class NotNullPredicate<T> i
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <T> Predicate<T> getInstance() {
+    public static <T> Predicate<T> notNullPredicate() {
         return (Predicate<T>) INSTANCE;
     }
 

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NotPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NotPredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NotPredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NotPredicate.java Wed Jul 20 14:44:46 2011
@@ -43,7 +43,7 @@ public final class NotPredicate<T> imple
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Predicate<T> getInstance(Predicate<? super T> predicate) {
+    public static <T> Predicate<T> notPredicate(Predicate<? super T> predicate) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java Wed Jul 20 14:44:46 2011
@@ -44,7 +44,7 @@ public final class NullIsExceptionPredic
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Predicate<T> getInstance(Predicate<? super T> predicate) {
+    public static <T> Predicate<T> nullIsExceptionPredicate(Predicate<? super T> predicate) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java Wed Jul 20 14:44:46 2011
@@ -43,7 +43,7 @@ public final class NullIsFalsePredicate<
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Predicate<T> getInstance(Predicate<? super T> predicate) {
+    public static <T> Predicate<T> nullIsFalsePredicate(Predicate<? super T> predicate) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java Wed Jul 20 14:44:46 2011
@@ -43,7 +43,7 @@ public final class NullIsTruePredicate<T
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Predicate<T> getInstance(Predicate<? super T> predicate) {
+    public static <T> Predicate<T> nullIsTruePredicate(Predicate<? super T> predicate) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/OnePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/OnePredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/OnePredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/OnePredicate.java Wed Jul 20 14:44:46 2011
@@ -55,7 +55,7 @@ public final class OnePredicate<T> imple
      * @throws IllegalArgumentException if any predicate in the array is null
      */
     @SuppressWarnings("unchecked")
-    public static <T> Predicate<T> getInstance(Predicate<? super T>[] predicates) {
+    public static <T> Predicate<T> onePredicate(Predicate<? super T>... predicates) {
         FunctorUtils.validate(predicates);
         if (predicates.length == 0) {
             return FalsePredicate.<T>falsePredicate();
@@ -75,7 +75,7 @@ public final class OnePredicate<T> imple
      * @throws IllegalArgumentException if the predicates array is null
      * @throws IllegalArgumentException if any predicate in the array is null
      */
-    public static <T> Predicate<T> getInstance(Collection<? extends Predicate<T>> predicates) {
+    public static <T> Predicate<T> onePredicate(Collection<? extends Predicate<T>> predicates) {
         Predicate<? super T>[] preds = FunctorUtils.validate(predicates);
         return new OnePredicate<T>(preds);
     }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/OrPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/OrPredicate.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/OrPredicate.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/OrPredicate.java Wed Jul 20 14:44:46 2011
@@ -46,7 +46,7 @@ public final class OrPredicate<T> implem
      * @return the <code>and</code> predicate
      * @throws IllegalArgumentException if either predicate is null
      */
-    public static <T> Predicate<T> getInstance(Predicate<? super T> predicate1, Predicate<? super T> predicate2) {
+    public static <T> Predicate<T> orPredicate(Predicate<? super T> predicate1, Predicate<? super T> predicate2) {
         if (predicate1 == null || predicate2 == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PredicateTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PredicateTransformer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PredicateTransformer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PredicateTransformer.java Wed Jul 20 14:44:46 2011
@@ -45,7 +45,7 @@ public class PredicateTransformer<T> imp
      * @return the <code>predicate</code> transformer
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Transformer<T, Boolean> getInstance(Predicate<? super T> predicate) {
+    public static <T> Transformer<T, Boolean> predicateTransformer(Predicate<? super T> predicate) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PrototypeFactory.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PrototypeFactory.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PrototypeFactory.java Wed Jul 20 14:44:46 2011
@@ -56,9 +56,9 @@ public class PrototypeFactory {
      * @throws IllegalArgumentException if the prototype cannot be cloned
      */
     @SuppressWarnings("unchecked")
-    public static <T> Factory<T> getInstance(T prototype) {
+    public static <T> Factory<T> prototypeFactory(T prototype) {
         if (prototype == null) {
-            return ConstantFactory.<T>getInstance(null);
+            return ConstantFactory.<T>constantFactory(null);
         }
         try {
             Method method = prototype.getClass().getMethod("clone", (Class[]) null);

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/StringValueTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/StringValueTransformer.java?rev=1148801&r1=1148800&r2=1148801&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/StringValueTransformer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/StringValueTransformer.java Wed Jul 20 14:44:46 2011
@@ -44,7 +44,7 @@ public final class StringValueTransforme
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <T> Transformer<T, String> getInstance() {
+    public static <T> Transformer<T, String> stringValueTransformer() {
         return (Transformer<T, String>) INSTANCE;
     }
 



Mime
View raw message