commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r1366162 - in /commons/proper/collections/trunk: ./ src/main/java/org/apache/commons/collections/functors/
Date Thu, 26 Jul 2012 19:23:41 GMT
Author: tn
Date: Thu Jul 26 19:23:39 2012
New Revision: 1366162

URL: http://svn.apache.org/viewvc?rev=1366162&view=rev
Log:
Cleanup of functors package.

Added:
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/package-info.java
      - copied, changed from r1361641, commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/package.html
Removed:
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/package.html
Modified:
    commons/proper/collections/trunk/pom.xml
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AllPredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AndPredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AnyPredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/CloneTransformer.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ClosureTransformer.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ConstantFactory.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ConstantTransformer.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/EqualPredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/Equator.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionClosure.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionFactory.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionPredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionTransformer.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FactoryTransformer.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FalsePredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ForClosure.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IfClosure.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/MapTransformer.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPClosure.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NonePredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotPredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullPredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OnePredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OrPredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PredicateDecorator.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TruePredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/WhileClosure.java

Modified: commons/proper/collections/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/pom.xml?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/pom.xml (original)
+++ commons/proper/collections/trunk/pom.xml Thu Jul 26 19:23:39 2012
@@ -140,6 +140,9 @@
       <name>Nathan Beyer</name>
     </contributor>
     <contributor>
+      <name>Rune Peter Bjørnstad</name>
+    </contributor>
+    <contributor>
       <name>Janek Bogucki</name>
     </contributor>
     <contributor>

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AllPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AllPredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AllPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AllPredicate.java Thu Jul 26 19:23:39 2012
@@ -34,11 +34,7 @@ import org.apache.commons.collections.Pr
  * threw an exception.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
- * @author Matt Benson
- * @author Stephen Kestle
+ * @version $Id$
  */
 public final class AllPredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
 
@@ -54,6 +50,7 @@ public final class AllPredicate<T> imple
      * If the array is size zero, the predicate always returns true.
      * If the array is size one, then that predicate is returned.
      *
+     * @param <T> the type that the predicate queries
      * @param predicates  the predicates to check, cloned, not null
      * @return the <code>all</code> predicate
      * @throws IllegalArgumentException if the predicates array is null
@@ -77,6 +74,7 @@ public final class AllPredicate<T> imple
      * If the collection is size zero, the predicate always returns true.
      * If the collection is size one, then that predicate is returned.
      *
+     * @param <T> the type that the predicate queries
      * @param predicates  the predicates to check, cloned, not null
      * @return the <code>all</code> predicate
      * @throws IllegalArgumentException if the predicates array is null

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AndPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AndPredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AndPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AndPredicate.java Thu Jul 26 19:23:39 2012
@@ -24,9 +24,7 @@ import org.apache.commons.collections.Pr
  * Predicate implementation that returns true if both the predicates return true.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class AndPredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
 
@@ -41,6 +39,7 @@ public final class AndPredicate<T> imple
     /**
      * Factory to create the predicate.
      *
+     * @param <T> the type that the predicate queries
      * @param predicate1  the first predicate to check, not null
      * @param predicate2  the second predicate to check, not null
      * @return the <code>and</code> predicate

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AnyPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AnyPredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AnyPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AnyPredicate.java Thu Jul 26 19:23:39 2012
@@ -30,10 +30,7 @@ import org.apache.commons.collections.Pr
  * threw an exception.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
- * @author Matt Benson
+ * @version $Id$
  */
 public final class AnyPredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
 
@@ -49,6 +46,7 @@ public final class AnyPredicate<T> imple
      * If the array is size zero, the predicate always returns false.
      * If the array is size one, then that predicate is returned.
      *
+     * @param <T> the type that the predicate queries
      * @param predicates  the predicates to check, cloned, not null
      * @return the <code>any</code> predicate
      * @throws IllegalArgumentException if the predicates array is null
@@ -72,6 +70,7 @@ public final class AnyPredicate<T> imple
      * If the collection is size zero, the predicate always returns false.
      * If the collection is size one, then that predicate is returned.
      *
+     * @param <T> the type that the predicate queries
      * @param predicates  the predicates to check, cloned, not null
      * @return the <code>all</code> predicate
      * @throws IllegalArgumentException if the predicates array is null

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java Thu Jul 26 19:23:39 2012
@@ -44,7 +44,7 @@ import org.apache.commons.collections.Fu
  * </pre>
  * 
  * @since 4.0
- * @version $Revision$
+ * @version $Id$
  */
 public abstract class CatchAndRethrowClosure<E> implements Closure<E> {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java Thu Jul 26 19:23:39 2012
@@ -25,9 +25,7 @@ import org.apache.commons.collections.Cl
  * Closure implementation that chains the specified closures together.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class ChainedClosure<E> implements Closure<E>, Serializable {
 
@@ -40,6 +38,7 @@ public class ChainedClosure<E> implement
     /**
      * Factory method that performs validation and copies the parameter array.
      * 
+     * @param <E> the type that the closure acts on
      * @param closures  the closures to chain, copied, no nulls
      * @return the <code>chained</code> closure
      * @throws IllegalArgumentException if the closures array is null
@@ -58,6 +57,7 @@ public class ChainedClosure<E> implement
      * result into the next closure. The ordering is that of the iterator()
      * method on the collection.
      * 
+     * @param <E> the type that the closure acts on
      * @param closures  a collection of closures to chain
      * @return the <code>chained</code> closure
      * @throws IllegalArgumentException if the closures collection is null

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java Thu Jul 26 19:23:39 2012
@@ -28,9 +28,7 @@ import org.apache.commons.collections.Tr
  * is passed to the second transformer and so on.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class ChainedTransformer<T> implements Transformer<T, T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/CloneTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/CloneTransformer.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/CloneTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/CloneTransformer.java Thu Jul 26 19:23:39 2012
@@ -26,9 +26,7 @@ import org.apache.commons.collections.Tr
  * Clone is performed using <code>PrototypeFactory.getInstance(input).create()</code>.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class CloneTransformer<T> implements Transformer<T, T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ClosureTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ClosureTransformer.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ClosureTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ClosureTransformer.java Thu Jul 26 19:23:39 2012
@@ -26,9 +26,7 @@ import org.apache.commons.collections.Tr
  * and then returns the input.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class ClosureTransformer<T> implements Transformer<T, T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java Thu Jul 26 19:23:39 2012
@@ -74,9 +74,7 @@ import org.apache.commons.collections.Pr
  * return <code>true</code> if the comparator returns a value greater than <code>0</code>.
  *
  * @since 4.0
- * @version $Revision$
- *
- * @author Rune Peter Bjørnstad.
+ * @version $Id$
  */
 public class ComparatorPredicate<T> implements Predicate<T>, Serializable {
 
@@ -100,6 +98,7 @@ public class ComparatorPredicate<T> impl
     /**
      * Factory to create the comparator predicate
      *
+     * @param <T> the type that the predicate queries
      * @param object  the object to compare to
      * @param comparator  the comparator to use for comparison
      * @return the predicate
@@ -112,6 +111,7 @@ public class ComparatorPredicate<T> impl
     /**
      * Factory to create the comparator predicate
      *
+     * @param <T> the type that the predicate queries
      * @param object  the object to compare to
      * @param comparator  the comparator to use for comparison
      * @param criterion  the criterion to use to evaluate comparison
@@ -156,7 +156,7 @@ public class ComparatorPredicate<T> impl
      *
      * @see org.apache.commons.collections.Predicate#evaluate(java.lang.Object)
      * @see java.util.Comparator#compare(java.lang.Object first, java.lang.Object second)
-     *
+     * 
      * @throws IllegalStateException if the criterion is invalid (really not possible)
      */
     public boolean evaluate(T target) {

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ConstantFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ConstantFactory.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ConstantFactory.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ConstantFactory.java Thu Jul 26 19:23:39 2012
@@ -28,9 +28,7 @@ import org.apache.commons.collections.Fa
  * use the prototype factory.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class ConstantFactory<T> implements Factory<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ConstantTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ConstantTransformer.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ConstantTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ConstantTransformer.java Thu Jul 26 19:23:39 2012
@@ -28,9 +28,7 @@ import org.apache.commons.collections.Tr
  * use the prototype factory.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class ConstantTransformer<I, O> implements Transformer<I, O>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java Thu Jul 26 19:23:39 2012
@@ -21,7 +21,7 @@ package org.apache.commons.collections.f
  * 
  * @param <T>
  * @since 4.0
- * @version $Revision$
+ * @version $Id$
  */
 public class DefaultEquator<T> implements Equator<T> {
     /** Static instance */

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/EqualPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/EqualPredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/EqualPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/EqualPredicate.java Thu Jul 26 19:23:39 2012
@@ -27,9 +27,7 @@ import org.apache.commons.collections.Pr
  * as the one stored in this predicate by equals.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class EqualPredicate<T> implements Predicate<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/Equator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/Equator.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/Equator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/Equator.java Thu Jul 26 19:23:39 2012
@@ -10,8 +10,6 @@
  */
 package org.apache.commons.collections.functors;
 
-import org.apache.commons.collections.map.HashedMap;
-
 /**
  * <p>
  * An equation function, which determines equality between objects of type T.
@@ -22,9 +20,8 @@ import org.apache.commons.collections.ma
  * </p>
  * 
  * @param <T> the types of object this {@link Equator} can evaluate.
- * @author Stephen Kestle
  * @since 4.0
- * @version $Revision$
+ * @version $Id$
  */
 public interface Equator<T> {
     /**
@@ -40,7 +37,7 @@ public interface Equator<T> {
      * Calculates the hash for the object, based on the method of equality used in the equate
      * method. This is used for classes that delegate their {@link Object#equals(Object) equals(Object)} method to an
      * Equator (and so must also delegate their {@link Object#hashCode() hashCode()} method), or for implementations
-     * of {@link HashedMap} that use an Equator for the key objects.
+     * of {@link org.apache.commons.collections.map.HashedMap} that use an Equator for the key objects.
      * 
      * @param o the object to calculate the hash for.
      * @return the hash of the object.

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionClosure.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionClosure.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionClosure.java Thu Jul 26 19:23:39 2012
@@ -25,9 +25,7 @@ import org.apache.commons.collections.Fu
  * Closure implementation that always throws an exception.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class ExceptionClosure<E> implements Closure<E>, Serializable {
 
@@ -40,6 +38,7 @@ public final class ExceptionClosure<E> i
     /**
      * Factory returning the singleton instance.
      * 
+     * @param <E> the type that the closure acts on
      * @return the singleton instance
      * @since 3.1
      */

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionFactory.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionFactory.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionFactory.java Thu Jul 26 19:23:39 2012
@@ -25,9 +25,7 @@ import org.apache.commons.collections.Fu
  * Factory implementation that always throws an exception.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class ExceptionFactory<T> implements Factory<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionPredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionPredicate.java Thu Jul 26 19:23:39 2012
@@ -25,9 +25,7 @@ import org.apache.commons.collections.Pr
  * Predicate implementation that always throws an exception.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class ExceptionPredicate<T> implements Predicate<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionTransformer.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ExceptionTransformer.java Thu Jul 26 19:23:39 2012
@@ -25,9 +25,7 @@ import org.apache.commons.collections.Tr
  * Transformer implementation that always throws an exception.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class ExceptionTransformer<I, O> implements Transformer<I, O>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FactoryTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FactoryTransformer.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FactoryTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FactoryTransformer.java Thu Jul 26 19:23:39 2012
@@ -25,9 +25,7 @@ import org.apache.commons.collections.Tr
  * Transformer implementation that calls a Factory and returns the result.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class FactoryTransformer<I, O> implements Transformer<I, O>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FalsePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FalsePredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FalsePredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FalsePredicate.java Thu Jul 26 19:23:39 2012
@@ -24,9 +24,7 @@ import org.apache.commons.collections.Pr
  * Predicate implementation that always returns false.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class FalsePredicate<T> implements Predicate<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ForClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ForClosure.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ForClosure.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ForClosure.java Thu Jul 26 19:23:39 2012
@@ -24,9 +24,7 @@ import org.apache.commons.collections.Cl
  * Closure implementation that calls another closure n times, like a for loop.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class ForClosure<E> implements Closure<E>, Serializable {
 
@@ -44,6 +42,7 @@ public class ForClosure<E> implements Cl
      * A null closure or zero count returns the <code>NOPClosure</code>.
      * A count of one returns the specified closure.
      * 
+     * @param <E> the type that the closure acts on
      * @param count  the number of times to execute the closure
      * @param closure  the closure to execute, not null
      * @return the <code>for</code> closure

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java Thu Jul 26 19:23:39 2012
@@ -26,10 +26,7 @@ import org.apache.commons.collections.Tr
  * Internal utilities for functors.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
- * @author Matt Benson
+ * @version $Id$
  */
 class FunctorUtils {
 
@@ -84,7 +81,8 @@ class FunctorUtils {
         }
         for (int i = 0; i < predicates.length; i++) {
             if (predicates[i] == null) {
-                throw new IllegalArgumentException("The predicate array must not contain a null predicate, index " + i + " was null");
+                throw new IllegalArgumentException(
+                        "The predicate array must not contain a null predicate, index " + i + " was null");
             }
         }
     }

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java Thu Jul 26 19:23:39 2012
@@ -25,9 +25,7 @@ import org.apache.commons.collections.Pr
  * as the one stored in this predicate.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class IdentityPredicate<T> implements Predicate<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IfClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IfClosure.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IfClosure.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/IfClosure.java Thu Jul 26 19:23:39 2012
@@ -26,10 +26,7 @@ import org.apache.commons.collections.Pr
  * based on a predicate.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
- * @author Matt Benson
+ * @version $Id$
  */
 public class IfClosure<E> implements Closure<E>, Serializable {
 
@@ -49,6 +46,7 @@ public class IfClosure<E> implements Clo
      * This factory creates a closure that performs no action when
      * the predicate is false.
      * 
+     * @param <E> the type that the closure acts on
      * @param predicate  predicate to switch on
      * @param trueClosure  closure used if true
      * @return the <code>if</code> closure
@@ -62,13 +60,16 @@ public class IfClosure<E> implements Clo
     /**
      * Factory method that performs validation.
      * 
+     * @param <E> the type that the closure acts on
      * @param predicate  predicate to switch on
      * @param trueClosure  closure used if true
      * @param falseClosure  closure used if false
      * @return the <code>if</code> closure
      * @throws IllegalArgumentException if any argument is null
      */
-    public static <E> Closure<E> ifClosure(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/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java Thu Jul 26 19:23:39 2012
@@ -25,9 +25,7 @@ import org.apache.commons.collections.Pr
  * the type stored in this predicate.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class InstanceofPredicate implements Predicate<Object>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java Thu Jul 26 19:23:39 2012
@@ -27,9 +27,7 @@ import org.apache.commons.collections.Fu
  * Factory implementation that creates a new object instance by reflection.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class InstantiateFactory<T> implements Factory<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java Thu Jul 26 19:23:39 2012
@@ -27,9 +27,7 @@ import org.apache.commons.collections.Tr
  * Transformer implementation that creates a new object instance by reflection.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class InstantiateTransformer<T> implements Transformer<Class<? extends T>, T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java Thu Jul 26 19:23:39 2012
@@ -27,9 +27,7 @@ import org.apache.commons.collections.Tr
  * Transformer implementation that creates a new object instance by reflection.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class InvokerTransformer<I, O> implements Transformer<I, O>, Serializable {
 
@@ -126,11 +124,14 @@ public class InvokerTransformer<I, O> im
             Method method = cls.getMethod(iMethodName, iParamTypes);
             return (O) method.invoke(input, iArgs);
         } catch (NoSuchMethodException ex) {
-            throw new FunctorException("InvokerTransformer: The method '" + iMethodName + "' on '" + input.getClass() + "' does not exist");
+            throw new FunctorException("InvokerTransformer: The method '" + iMethodName + "' on '" +
+                                       input.getClass() + "' does not exist");
         } catch (IllegalAccessException ex) {
-            throw new FunctorException("InvokerTransformer: The method '" + iMethodName + "' on '" + input.getClass() + "' cannot be accessed");
+            throw new FunctorException("InvokerTransformer: The method '" + iMethodName + "' on '" +
+                                       input.getClass() + "' cannot be accessed");
         } catch (InvocationTargetException ex) {
-            throw new FunctorException("InvokerTransformer: The method '" + iMethodName + "' on '" + input.getClass() + "' threw an exception", ex);
+            throw new FunctorException("InvokerTransformer: The method '" + iMethodName + "' on '" +
+                                       input.getClass() + "' threw an exception", ex);
         }
     }
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/MapTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/MapTransformer.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/MapTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/MapTransformer.java Thu Jul 26 19:23:39 2012
@@ -26,9 +26,7 @@ import org.apache.commons.collections.Tr
  * using the input parameter as a key.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class MapTransformer<I, O> implements Transformer<I, O>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPClosure.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPClosure.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPClosure.java Thu Jul 26 19:23:39 2012
@@ -24,9 +24,7 @@ import org.apache.commons.collections.Cl
  * Closure implementation that does nothing.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class NOPClosure<E> implements Closure<E>, Serializable {
 
@@ -39,6 +37,7 @@ public final class NOPClosure<E> impleme
     /**
      * Factory returning the singleton instance.
      *
+     * @param <E> the type that the closure acts on
      * @return the singleton instance
      * @since 3.1
      */

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java Thu Jul 26 19:23:39 2012
@@ -24,9 +24,7 @@ import org.apache.commons.collections.Tr
  * Transformer implementation that does nothing.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class NOPTransformer<T> implements Transformer<T, T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NonePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NonePredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NonePredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NonePredicate.java Thu Jul 26 19:23:39 2012
@@ -30,10 +30,7 @@ import org.apache.commons.collections.Pr
  * threw an exception.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
- * @author Matt Benson
+ * @version $Id$
  */
 public final class NonePredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java Thu Jul 26 19:23:39 2012
@@ -24,9 +24,7 @@ import org.apache.commons.collections.Pr
  * Predicate implementation that returns true if the input is not null.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class NotNullPredicate<T> implements Predicate<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotPredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NotPredicate.java Thu Jul 26 19:23:39 2012
@@ -24,9 +24,7 @@ import org.apache.commons.collections.Pr
  * Predicate implementation that returns the opposite of the decorated predicate.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class NotPredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java Thu Jul 26 19:23:39 2012
@@ -25,9 +25,7 @@ import org.apache.commons.collections.Pr
  * Predicate implementation that throws an exception if the input is null.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class NullIsExceptionPredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java Thu Jul 26 19:23:39 2012
@@ -24,9 +24,7 @@ import org.apache.commons.collections.Pr
  * Predicate implementation that returns false if the input is null.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class NullIsFalsePredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java Thu Jul 26 19:23:39 2012
@@ -24,9 +24,7 @@ import org.apache.commons.collections.Pr
  * Predicate implementation that returns true if the input is null.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class NullIsTruePredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullPredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/NullPredicate.java Thu Jul 26 19:23:39 2012
@@ -24,9 +24,7 @@ import org.apache.commons.collections.Pr
  * Predicate implementation that returns true if the input is null.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class NullPredicate<T> implements Predicate<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OnePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OnePredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OnePredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OnePredicate.java Thu Jul 26 19:23:39 2012
@@ -30,10 +30,7 @@ import org.apache.commons.collections.Pr
  * threw an exception.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
- * @author Matt Benson
+ * @version $Id$
  */
 public final class OnePredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OrPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OrPredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OrPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/OrPredicate.java Thu Jul 26 19:23:39 2012
@@ -24,9 +24,7 @@ import org.apache.commons.collections.Pr
  * Predicate implementation that returns true if either of the predicates return true.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class OrPredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PredicateDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PredicateDecorator.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PredicateDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PredicateDecorator.java Thu Jul 26 19:23:39 2012
@@ -24,10 +24,7 @@ import org.apache.commons.collections.Pr
  * This interface enables tools to access the decorated predicates.
  *
  * @since 3.1
- * @version $Revision$
- *
- * @author Stephen Colebourne
- * @author Stephen Kestle
+ * @version $Id$
  */
 public interface PredicateDecorator<T> extends Predicate<T> {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java Thu Jul 26 19:23:39 2012
@@ -26,9 +26,7 @@ import org.apache.commons.collections.Tr
  * and then returns the result.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class PredicateTransformer<T> implements Transformer<T, Boolean>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java Thu Jul 26 19:23:39 2012
@@ -32,9 +32,7 @@ import org.apache.commons.collections.Fu
  * Factory implementation that creates a new instance each time based on a prototype.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class PrototypeFactory {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java Thu Jul 26 19:23:39 2012
@@ -25,9 +25,7 @@ import org.apache.commons.collections.Tr
  * <code>String.valueOf</code> on the input object.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class StringValueTransformer<T> implements Transformer<T, String>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java Thu Jul 26 19:23:39 2012
@@ -27,9 +27,7 @@ import org.apache.commons.collections.Pr
  * like a switch statement.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class SwitchClosure<E> implements Closure<E>, Serializable {
 
@@ -46,6 +44,7 @@ public class SwitchClosure<E> implements
     /**
      * Factory method that performs validation and copies the parameter arrays.
      *
+     * @param <E> the type that the closure acts on
      * @param predicates  array of predicates, cloned, no nulls
      * @param closures  matching array of closures, cloned, no nulls
      * @param defaultClosure  the closure to use if no match, null means nop
@@ -54,7 +53,9 @@ public class SwitchClosure<E> implements
      * @throws IllegalArgumentException if any element in the array is null
      */
     @SuppressWarnings("unchecked")
-    public static <E> Closure<E> switchClosure(Predicate<? super E>[] predicates, Closure<? super E>[] closures, Closure<? super E> defaultClosure) {
+    public static <E> Closure<E> switchClosure(Predicate<? super E>[] predicates,
+                                               Closure<? super E>[] closures,
+                                               Closure<? super E> defaultClosure) {
         FunctorUtils.validate(predicates);
         FunctorUtils.validate(closures);
         if (predicates.length != closures.length) {
@@ -77,6 +78,7 @@ public class SwitchClosure<E> implements
      * null key. The ordering is that of the iterator() method on the entryset
      * collection of the map.
      *
+     * @param <E> the type that the closure acts on
      * @param predicatesAndClosures  a map of predicates to closures
      * @return the <code>switch</code> closure
      * @throws IllegalArgumentException if the map is null
@@ -114,7 +116,8 @@ public class SwitchClosure<E> implements
      * @param defaultClosure  the closure to use if no match, null means nop
      */
     @SuppressWarnings("unchecked")
-    public SwitchClosure(Predicate<? super E>[] predicates, Closure<? super E>[] closures, Closure<? super E> defaultClosure) {
+    public SwitchClosure(Predicate<? super E>[] predicates, Closure<? super E>[] closures,
+                         Closure<? super E> defaultClosure) {
         super();
         iPredicates = predicates;
         iClosures = closures;

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java Thu Jul 26 19:23:39 2012
@@ -27,9 +27,7 @@ import org.apache.commons.collections.Tr
  * like a switch statement.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class SwitchTransformer<I, O> implements Transformer<I, O>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java Thu Jul 26 19:23:39 2012
@@ -26,9 +26,7 @@ import org.apache.commons.collections.Tr
  * another <code>Predicate</code>.
  *
  * @since 3.1
- * @version $Revision$
- * @author Alban Peignier
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class TransformedPredicate<T> implements Predicate<T>, PredicateDecorator<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java Thu Jul 26 19:23:39 2012
@@ -26,9 +26,7 @@ import org.apache.commons.collections.Tr
  * and ignore the result.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class TransformerClosure<E> implements Closure<E>, Serializable {
 
@@ -43,6 +41,7 @@ public class TransformerClosure<E> imple
      * <p>
      * A null transformer will return the <code>NOPClosure</code>.
      * 
+     * @param <E> the type that the closure acts on
      * @param transformer  the transformer to call, null means nop
      * @return the <code>transformer</code> closure
      */

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java Thu Jul 26 19:23:39 2012
@@ -26,9 +26,7 @@ import org.apache.commons.collections.Tr
  * Predicate implementation that returns the result of a transformer.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class TransformerPredicate<T> implements Predicate<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TruePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TruePredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TruePredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/TruePredicate.java Thu Jul 26 19:23:39 2012
@@ -24,10 +24,7 @@ import org.apache.commons.collections.Pr
  * Predicate implementation that always returns true.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
- * @author Stephen Kestle
+ * @version $Id$
  */
 public final class TruePredicate<T> implements Predicate<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java Thu Jul 26 19:23:39 2012
@@ -27,9 +27,7 @@ import org.apache.commons.collections.Pr
  * passed into the predicate.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class UniquePredicate<T> implements Predicate<T>, Serializable {
 

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/WhileClosure.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/WhileClosure.java?rev=1366162&r1=1366161&r2=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/WhileClosure.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/WhileClosure.java Thu Jul 26 19:23:39 2012
@@ -26,9 +26,7 @@ import org.apache.commons.collections.Pr
  * like a do-while or while loop.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class WhileClosure<E> implements Closure<E>, Serializable {
 
@@ -45,13 +43,15 @@ public class WhileClosure<E> implements 
     /**
      * Factory method that performs validation.
      * 
+     * @param <E> the type that the closure acts on
      * @param predicate  the predicate used to evaluate when the loop terminates, not null
      * @param closure  the closure the execute, not null
      * @param doLoop  true to act as a do-while loop, always executing the closure once
      * @return the <code>while</code> closure
      * @throws IllegalArgumentException if the predicate or closure is null
      */
-    public static <E> Closure<E> whileClosure(Predicate<? super E> predicate, Closure<? super E> closure, boolean doLoop) {
+    public static <E> Closure<E> whileClosure(Predicate<? super E> predicate,
+                                              Closure<? super E> closure, boolean doLoop) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }

Copied: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/package-info.java (from r1361641, commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/package.html)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/package-info.java?p2=commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/package-info.java&p1=commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/package.html&r1=1361641&r2=1366162&rev=1366162&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/package.html (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/package-info.java Thu Jul 26 19:23:39 2012
@@ -1,27 +1,27 @@
-<!-- $Id$ -->
- <!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-  -->
-<BODY>
-<p>
-This package contains implementations of the
-{@link org.apache.commons.collections.Closure Closure},
-{@link org.apache.commons.collections.Predicate Predicate},
-{@link org.apache.commons.collections.Transformer Transformer} and
-{@link org.apache.commons.collections.Factory Factory} interfaces.
-These provide simple callbacks for processing with collections.
-</p>
-</BODY>
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * This package contains implementations of the
+ * {@link org.apache.commons.collections.Closure Closure},
+ * {@link org.apache.commons.collections.Predicate Predicate},
+ * {@link org.apache.commons.collections.Transformer Transformer} and
+ * {@link org.apache.commons.collections.Factory Factory} interfaces.
+ * These provide simple callbacks for processing with collections.
+ * 
+ * @version $Id$
+ */
+package org.apache.commons.collections.functors;



Mime
View raw message