This looks like it should have been deprecated and rebased when all of the
iterators were moved to the iterators package. This patch changes it to
inherit from o.a.c.collections.iterator.UniqueFilterIterator.
I've also added a test case for collections.UniqueFilterIterator, functionally
identical to the case for collections.iterators.UFI.
Index: src/java/org/apache/commons/collections/UniqueFilterIterator.java
===================================================================
RCS file: /home/cvspublic/jakarta-commons/collections/src/java/org/apache/commons/collections/UniqueFilterIterator.java,v
retrieving revision 1.3
diff -u -b -r1.3 UniqueFilterIterator.java
--- src/java/org/apache/commons/collections/UniqueFilterIterator.java 15 Aug 2002 20:04:31 -0000 1.3
+++ src/java/org/apache/commons/collections/UniqueFilterIterator.java 6 Oct 2002 23:13:38 -0000
@@ -60,9 +60,7 @@
*/
package org.apache.commons.collections;
-import java.util.HashSet;
import java.util.Iterator;
-import java.util.NoSuchElementException;
/** A FilterIterator which only returns "unique" Objects. Internally,
* the Iterator maintains a Set of objects it has already encountered,
@@ -71,9 +69,11 @@
* @author Morgan Delagrange
* @version $Id: UniqueFilterIterator.java,v 1.3 2002/08/15 20:04:31 pjack Exp $
* @since 2.1
+ * @deprecated this class has been moved to the iterators subpackage
*/
-public class UniqueFilterIterator extends FilterIterator {
+public class UniqueFilterIterator
+extends org.apache.commons.collections.iterators.UniqueFilterIterator {
//-------------------------------------------------------------------------
@@ -83,17 +83,6 @@
* @param iterator the iterator to use
*/
public UniqueFilterIterator( Iterator iterator ) {
- super( iterator, new UniquePredicate() );
+ super( iterator);
}
-
- private static class UniquePredicate implements Predicate {
-
- HashSet set = new HashSet();
-
- public boolean evaluate(Object object) {
- return set.add(object);
- }
-
- }
-
}
/*
* $Header: /home/cvspublic/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java,v 1.1 2002/08/15 23:13:52 pjack Exp $
* $Revision: 1.1 $
* $Date: 2002/08/15 23:13:52 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.commons.collections;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
import junit.framework.Test;
import junit.framework.TestSuite;
/**
* Tests the ArrayIterator to ensure that the next() method will actually
* perform the iteration rather than the hasNext() method.
* The code of this test was supplied by Mauricio S. Moura
*
* @author James Strachan
* @author Mauricio S. Moura
* @author Morgan Delagrange
* @version $Id: TestUniqueFilterIterator.java,v 1.1 2002/08/15 23:13:52 pjack Exp $
*/
public class TestUniqueFilterIterator extends org.apache.commons.collections.iterators.TestIterator {
protected String[] testArray = {
"One", "Two", "Three", "Four", "Five", "Six"
};
protected List list1 = null;
public static Test suite() {
return new TestSuite(TestUniqueFilterIterator.class);
}
public TestUniqueFilterIterator(String testName) {
super(testName);
}
public void setUp() {
list1 = new ArrayList();
list1.add("One");
list1.add("Two");
list1.add("Three");
list1.add("Two");
list1.add("One");
list1.add("Four");
list1.add("Five");
list1.add("Five");
list1.add("Six");
list1.add("Five");
}
public Iterator makeEmptyIterator() {
ArrayList list = new ArrayList();
return new UniqueFilterIterator(list.iterator());
}
public Iterator makeFullIterator() {
Iterator i = list1.iterator();
return new UniqueFilterIterator(i);
}
/**
* Return a new, empty {@link Object} to used for testing.
*/
public Object makeObject() {
return makeFullIterator();
}
public void testIterator() {
Iterator iter = (Iterator) makeFullIterator();
for ( int i = 0; i < testArray.length; i++ ) {
Object testValue = testArray[i];
Object iterValue = iter.next();
assertEquals( "Iteration value is correct", testValue, iterValue );
}
assertTrue("Iterator should now be empty", ! iter.hasNext() );
try {
Object testValue = iter.next();
} catch (Exception e) {
assertTrue("NoSuchElementException must be thrown",
e.getClass().equals((new NoSuchElementException()).getClass()));
}
}
public void testRemove() {
Iterator iter = (Iterator) makeFullIterator();
try {
iter.remove();
fail("FilterIterator does not support the remove() method");
} catch (UnsupportedOperationException e) {
}
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
