svn commit: r815052 - /commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PredicateDecorator.java

[ba...@apache.org]

Author: bayard
Date: Tue Sep 15 05:55:14 2009
New Revision: 815052

URL: http://svn.apache.org/viewvc?rev=815052&view=rev
Log:
Merging from -r468106:814127 of collections_jdk5_branch - namely where this code was generified; mostly in r738956.

Also see the following revisions:

    ------------------------------------------------------------------------
    r641231 | skestle | 2008-03-26 02:58:51 -0700 (Wed, 26 Mar 2008) | 1 line
    
    Started incorporating Edwin's patch for COLLECTIONS-253, in preparation for COLLECTIONS-290.
    ------------------------------------------------------------------------

Modified:
    commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PredicateDecorator.java

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PredicateDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PredicateDecorator.java?rev=815052&r1=815051&r2=815052&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PredicateDecorator.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PredicateDecorator.java Tue Sep 15 05:55:14 2009
@@ -27,8 +27,9 @@
  * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
+ * @author Stephen Kestle
  */
-public interface PredicateDecorator extends Predicate {
+public interface PredicateDecorator<T> extends Predicate<T> {
 
     /**
      * Gets the predicates being decorated as an array.
@@ -38,6 +39,6 @@
      * 
      * @return the predicates being decorated
      */
-    Predicate[] getPredicates();
+    Predicate<? super T>[] getPredicates();
 
 }