Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change to use PredicateUtils rather than own Predicate 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131081 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stephen Colebourne 2003-05-16 14:20:01 +00:00
parent 20be12841f
commit 0d7be3b2cf
2 changed files with 9 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/java/org/apache/commons/collections/decorators/TypedCollection.java
View File

@ -1,5 +1,5 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/decorators/Attic/TypedCollection.java,v 1.3 2003/05/09 16:41:57 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/decorators/Attic/TypedCollection.java,v 1.4 2003/05/16 14:19:31 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -60,6 +60,7 @@ package org.apache.commons.collections.decorators;
import java.util.Collection;
import org.apache.commons.collections.Predicate;
import org.apache.commons.collections.PredicateUtils;
/**
* <code>TypedCollection</code> decorates another <code>Collection</code>
@ -70,7 +71,7 @@ import org.apache.commons.collections.Predicate;
* collection, an IllegalArgumentException is thrown.
*
* @since Commons Collections 3.0
* @version $Revision: 1.3 $ $Date: 2003/05/09 16:41:57 $
* @version $Revision: 1.4 $ $Date: 2003/05/16 14:19:31 $
*
* @author Stephen Colebourne
* @author Matthew Hawthorne
@ -105,36 +106,7 @@ public class TypedCollection {
* @throws IllegalArgumentException if type is null
*/
protected static Predicate getPredicate(Class type) {
return new InstanceofPredicate(type);
}
/**
* <code>Predicate</code> implementation that checks the type of an object.
* This class may eventually be replaced by
* <code>org.apache.commons.lang.functor.PredicateUtils.instanceofPredicate()</code>.
*/
static class InstanceofPredicate implements Predicate {
/** The type to check for */
private final Class type;
/**
* Constructor
*/
public InstanceofPredicate(Class type) {
if (type == null) {
throw new IllegalArgumentException("Type must not be null");
}
this.type = type;
}
/**
* Return true if the object is an instanceof the type of the predicate.
* @param object an <code>Object</code>
* @return <code>true</code> if the object is an instanceof the type of the predicate
*/
public boolean evaluate(Object object) {
return type.isInstance(object);
}
return PredicateUtils.instanceofPredicate(type);
}
}

21
src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
View File

@ -1,5 +1,5 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java,v 1.3 2003/01/15 21:49:14 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java,v 1.4 2003/05/16 14:20:01 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -57,9 +57,9 @@
*/
package org.apache.commons.collections.iterators;
import java.util.HashSet;
import java.util.Iterator;
import org.apache.commons.collections.Predicate;
import org.apache.commons.collections.PredicateUtils;
/**
* A FilterIterator which only returns "unique" Objects. Internally,
@ -67,7 +67,7 @@ import org.apache.commons.collections.Predicate;
* and duplicate Objects are skipped.
*
* @since Commons Collections 2.1
* @version $Revision: 1.3 $ $Date: 2003/01/15 21:49:14 $
* @version $Revision: 1.4 $ $Date: 2003/05/16 14:20:01 $
*
* @author Morgan Delagrange
*/
@ -81,18 +81,7 @@ public class UniqueFilterIterator extends FilterIterator {
* @param iterator the iterator to use
*/
public UniqueFilterIterator( Iterator iterator ) {
super( iterator, new UniquePredicate() );
}
/**
* Private Predicate needed to implement the unique behaviour.
*/
private static class UniquePredicate implements Predicate {
HashSet set = new HashSet();
public boolean evaluate(Object object) {
return set.add(object);
}
super(iterator, PredicateUtils.uniquePredicate());
}
}