scolebourne 2003/01/15 13:45:24
Modified: collections/src/java/org/apache/commons/collections/iterators
FilterIterator.java CollatingIterator.java
FilterListIterator.java EnumerationIterator.java
Log:
Update licence
Update since and version tags
Revision Changes Path
1.2 +33 -34
jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/FilterIterator.java
Index: FilterIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/FilterIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FilterIterator.java 15 Aug 2002 23:13:51 -0000 1.1
+++ FilterIterator.java 15 Jan 2003 21:45:23 -0000 1.2
@@ -1,13 +1,10 @@
/*
* $Header$
- * $Revision$
- * $Date$
- *
* ====================================================================
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,11 +20,11 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
+ * any, must include the following acknowledgment:
* "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.
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
@@ -36,7 +33,7 @@
*
* 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.
+ * permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -64,18 +61,19 @@
import java.util.NoSuchElementException;
import org.apache.commons.collections.Predicate;
-
-/** A Proxy {@link Iterator Iterator} which takes a {@link Predicate Predicate}
instance to filter
- * out objects from an underlying {@link Iterator Iterator} instance.
- * Only objects for which the
- * specified <code>Predicate</code> evaluates to <code>true</code> are
- * returned.
- *
- * @since 1.0
- * @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @author Jan Sorensen
- */
-
+/**
+ * A Proxy {@link Iterator Iterator} which takes a {@link Predicate Predicate}
instance to filter
+ * out objects from an underlying {@link Iterator Iterator} instance.
+ * Only objects for which the
+ * specified <code>Predicate</code> evaluates to <code>true</code> are
+ * returned.
+ *
+ * @since Commons Collections 1.0
+ * @version $Revision$ $Date$
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
+ * @author Jan Sorensen
+ */
public class FilterIterator extends ProxyIterator {
/** Holds value of property predicate. */
@@ -88,31 +86,32 @@
//-------------------------------------------------------------------------
/**
- * Constructs a new <Code>FilterIterator</Code> that will not function
- * until {@link #setIterator(Iterator) setIterator} is invoked.
+ * Constructs a new <Code>FilterIterator</Code> that will not function
+ * until {@link #setIterator(Iterator) setIterator} is invoked.
*/
public FilterIterator() {
+ super();
}
/**
- * Constructs a new <Code>FilterIterator</Code> that will not function
- * until {@link #setPredicate(Predicate) setPredicate} is invoked.
+ * Constructs a new <Code>FilterIterator</Code> that will not function
+ * until {@link #setPredicate(Predicate) setPredicate} is invoked.
*
- * @param iterator the iterator to use
+ * @param iterator the iterator to use
*/
- public FilterIterator( Iterator iterator ) {
- super( iterator );
+ public FilterIterator(Iterator iterator) {
+ super(iterator);
}
/**
- * Constructs a new <Code>FilterIterator</Code> that will use the
- * given iterator and predicate.
+ * Constructs a new <Code>FilterIterator</Code> that will use the
+ * given iterator and predicate.
*
- * @param iterator the iterator to use
- * @param predicate the predicate to use
+ * @param iterator the iterator to use
+ * @param predicate the predicate to use
*/
- public FilterIterator( Iterator iterator, Predicate predicate ) {
- super( iterator );
+ public FilterIterator(Iterator iterator, Predicate predicate) {
+ super(iterator);
this.predicate = predicate;
}
1.5 +11 -12
jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
Index: CollatingIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/CollatingIterator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CollatingIterator.java 13 Dec 2002 11:03:42 -0000 1.4
+++ CollatingIterator.java 15 Jan 2003 21:45:23 -0000 1.5
@@ -1,13 +1,10 @@
/*
* $Header$
- * $Revision$
- * $Date$
- *
* ====================================================================
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,11 +20,11 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
+ * any, must include the following acknowledgment:
* "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.
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
@@ -36,7 +33,7 @@
*
* 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.
+ * permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -68,6 +65,7 @@
import java.util.NoSuchElementException;
import java.util.ArrayList;
import java.util.BitSet;
+
/**
* Provides an ordered iteration over the elements contained in
* a collection of ordered {@link Iterator}s. In other words,
@@ -75,10 +73,11 @@
* my {@link #next} method will return the lesser of
* <code>A.next()</code> and <code>B.next()</code>.
*
- * @since 2.1
- * @author Rodney Waldhoff
- * @author <a href="mailto:[EMAIL PROTECTED]";>Stephen Colebourne</a>
+ * @since Commons Collections 2.1
* @version $Revision$ $Date$
+ *
+ * @author Rodney Waldhoff
+ * @author Stephen Colebourne
*/
public class CollatingIterator implements Iterator {
1.2 +31 -31
jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/FilterListIterator.java
Index: FilterListIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/FilterListIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FilterListIterator.java 15 Aug 2002 23:13:51 -0000 1.1
+++ FilterListIterator.java 15 Jan 2003 21:45:23 -0000 1.2
@@ -1,13 +1,10 @@
/*
* $Header$
- * $Revision$
- * $Date$
- *
* ====================================================================
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,11 +20,11 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
+ * any, must include the following acknowledgment:
* "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.
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
@@ -36,7 +33,7 @@
*
* 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.
+ * permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -65,17 +62,18 @@
import org.apache.commons.collections.Predicate;
/**
- * A proxy {@link ListIterator ListIterator} which
- * takes a {@link Predicate Predicate} instance to filter
- * out objects from an underlying <code>ListIterator</code>
- * instance. Only objects for which the specified
- * <code>Predicate</code> evaluates to <code>true</code> are
- * returned by the iterator.
- *
- * @since 2.0
- * @version $Revision$ $Date$
- * @author Rodney Waldhoff
- */
+ * A proxy {@link ListIterator ListIterator} which
+ * takes a {@link Predicate Predicate} instance to filter
+ * out objects from an underlying <code>ListIterator</code>
+ * instance. Only objects for which the specified
+ * <code>Predicate</code> evaluates to <code>true</code> are
+ * returned by the iterator.
+ *
+ * @since Commons Collections 2.0
+ * @version $Revision$ $Date$
+ *
+ * @author Rodney Waldhoff
+ */
public class FilterListIterator extends ProxyListIterator {
// Constructors
@@ -88,23 +86,24 @@
* and {@link #setPredicate(Predicate) setPredicate} are invoked.
*/
public FilterListIterator() {
+ super();
}
/**
- * Constructs a new <Code>FilterListIterator</Code> that will not
- * function until {@link #setPredicate(Predicate) setPredicate} is invoked.
+ * Constructs a new <Code>FilterListIterator</Code> that will not
+ * function until {@link #setPredicate(Predicate) setPredicate} is invoked.
*
- * @param iterator the iterator to use
+ * @param iterator the iterator to use
*/
public FilterListIterator(ListIterator iterator ) {
super(iterator);
}
/**
- * Constructs a new <Code>FilterListIterator</Code>.
+ * Constructs a new <Code>FilterListIterator</Code>.
*
- * @param iterator the iterator to use
- * @param predicate the predicate to use
+ * @param iterator the iterator to use
+ * @param predicate the predicate to use
*/
public FilterListIterator(ListIterator iterator, Predicate predicate) {
super(iterator);
@@ -112,14 +111,15 @@
}
/**
- * Constructs a new <Code>FilterListIterator</Code> that will not
- * function until
- * {@link ProxyListIterator#setListIterator(ListIterator) setListIterator}
- * is invoked.
+ * Constructs a new <Code>FilterListIterator</Code> that will not
+ * function until
+ * {@link ProxyListIterator#setListIterator(ListIterator) setListIterator}
+ * is invoked.
*
- * @param predicate the predicate to use.
+ * @param predicate the predicate to use.
*/
public FilterListIterator(Predicate predicate) {
+ super();
this.predicate = predicate;
}
1.2 +16 -16
jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/EnumerationIterator.java
Index: EnumerationIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/EnumerationIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnumerationIterator.java 15 Aug 2002 23:13:51 -0000 1.1
+++ EnumerationIterator.java 15 Jan 2003 21:45:23 -0000 1.2
@@ -1,13 +1,10 @@
/*
* $Header$
- * $Revision$
- * $Date$
- *
* ====================================================================
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,11 +20,11 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
+ * any, must include the following acknowledgment:
* "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.
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
@@ -36,7 +33,7 @@
*
* 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.
+ * permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -64,13 +61,16 @@
import java.util.Enumeration;
import java.util.Iterator;
-/** Adapter to make {@link Enumeration Enumeration} instances appear
- * to be {@link Iterator Iterator} instances.
- *
- * @since 1.0
- * @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- */
+/**
+ * Adapter to make {@link Enumeration Enumeration} instances appear
+ * to be {@link Iterator Iterator} instances.
+ *
+ * @since Commons Collections 1.0
+ * @version $Revision$ $Date$
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
+ */
public class EnumerationIterator implements Iterator {
private Collection collection;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
