From 922da12f3f7d84355755082351e488575736031c Mon Sep 17 00:00:00 2001
From: Thomas Neidhart <tn@apache.org>
Date: Sun, 29 Jul 2012 09:29:15 +0000
Subject: [PATCH] Cleanup of iterators package.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1366797 13f79535-47bb-0310-9956-ffa450edef68
---
 .../iterators/AbstractEmptyIterator.java      |  4 +--
 .../iterators/AbstractIteratorDecorator.java  |  5 +---
 .../AbstractListIteratorDecorator.java        |  5 +---
 .../AbstractMapIteratorDecorator.java         |  4 +--
 .../AbstractOrderedMapIteratorDecorator.java  |  4 +--
 .../collections/iterators/ArrayIterator.java  |  8 +-----
 .../iterators/ArrayListIterator.java          |  6 +---
 .../iterators/CollatingIterator.java          |  5 +---
 .../collections/iterators/EmptyIterator.java  |  4 +--
 .../iterators/EmptyListIterator.java          |  4 +--
 .../iterators/EmptyMapIterator.java           |  4 +--
 .../iterators/EmptyOrderedIterator.java       |  7 ++---
 .../iterators/EmptyOrderedMapIterator.java    |  8 ++----
 .../iterators/EntrySetMapIterator.java        |  4 +--
 .../iterators/EnumerationIterator.java        |  5 +---
 .../collections/iterators/FilterIterator.java |  7 +----
 .../iterators/FilterListIterator.java         |  4 +--
 .../collections/iterators/IteratorChain.java  |  6 +---
 .../iterators/IteratorEnumeration.java        |  4 +--
 .../iterators/IteratorIterable.java           |  2 +-
 .../iterators/ListIteratorWrapper.java        |  7 +----
 .../iterators/LoopingIterator.java            |  5 +---
 .../iterators/LoopingListIterator.java        |  4 +--
 .../iterators/ObjectArrayIterator.java        |  9 +-----
 .../iterators/ObjectArrayListIterator.java    |  6 +---
 .../iterators/ObjectGraphIterator.java        |  4 +--
 .../iterators/ReverseListIterator.java        |  4 +--
 .../iterators/SingletonIterator.java          |  6 +---
 .../iterators/SingletonListIterator.java      |  5 +---
 .../iterators/TransformIterator.java          |  5 +---
 .../iterators/UniqueFilterIterator.java       |  4 +--
 .../iterators/UnmodifiableIterator.java       |  4 +--
 .../iterators/UnmodifiableListIterator.java   |  4 +--
 .../iterators/UnmodifiableMapIterator.java    |  4 +--
 .../UnmodifiableOrderedMapIterator.java       |  4 +--
 .../collections/iterators/package-info.java   | 28 +++++++++++++++++++
 .../collections/iterators/package.html        | 27 ------------------
 37 files changed, 67 insertions(+), 163 deletions(-)
 create mode 100644 src/main/java/org/apache/commons/collections/iterators/package-info.java
 delete mode 100644 src/main/java/org/apache/commons/collections/iterators/package.html

diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java b/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
index 6f0b89d34..98776a780 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
@@ -22,9 +22,7 @@ import java.util.NoSuchElementException;
  * Provides an implementation of an empty iterator.
  *
  * @since 3.1
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 abstract class AbstractEmptyIterator<E> {
  
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java b/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
index 23dd86cb1..f57c1b5df 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
@@ -24,10 +24,7 @@ import java.util.Iterator;
  * All methods are forwarded to the decorated iterator.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author James Strachan
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public abstract class AbstractIteratorDecorator<E> extends AbstractUntypedIteratorDecorator<E, E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java b/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
index 035d4ef1f..5b6dd290b 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
@@ -24,10 +24,7 @@ import java.util.ListIterator;
  * All methods are forwarded to the decorated list iterator.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Rodney Waldhoff
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class AbstractListIteratorDecorator<E> implements ListIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
index 83d5a766e..9ca0bbec4 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
@@ -24,9 +24,7 @@ import org.apache.commons.collections.MapIterator;
  * All methods are forwarded to the decorated map iterator.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class AbstractMapIteratorDecorator<K, V> implements MapIterator<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
index d37167e8d..05f6bfbcb 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
@@ -24,9 +24,7 @@ import org.apache.commons.collections.OrderedMapIterator;
  * All methods are forwarded to the decorated map iterator.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class AbstractOrderedMapIteratorDecorator<K, V> implements OrderedMapIterator<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/ArrayIterator.java b/src/main/java/org/apache/commons/collections/iterators/ArrayIterator.java
index 37b1a00d4..3c71fd063 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ArrayIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/ArrayIterator.java
@@ -33,13 +33,7 @@ import org.apache.commons.collections.ResettableIterator;
  * the iterator back to the start if required.
  *
  * @since 1.0
- * @version $Revision$
- *
- * @author James Strachan
- * @author Mauricio S. Moura
- * @author Michael A. Smith
- * @author Neil O'Toole
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class ArrayIterator<E> implements ResettableIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java b/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java
index 26e976cae..2b9665f24 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java
@@ -38,11 +38,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * @see java.util.ListIterator
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Neil O'Toole
- * @author Stephen Colebourne
- * @author Phil Steitz
+ * @version $Id$
  */
 public class ArrayListIterator<E> extends ArrayIterator<E>
         implements ListIterator<E>, ResettableListIterator<E> {
diff --git a/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java b/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java
index 4bcb55c88..0c14c0edd 100644
--- a/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java
@@ -36,10 +36,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * lesser of <code>A.next()</code> and <code>B.next()</code>.
  *
  * @since 2.1
- * @version $Revision$
- *
- * @author Rodney Waldhoff
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class CollatingIterator<E> implements Iterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java b/src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java
index fa09555bd..3b00d9033 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java
@@ -28,9 +28,7 @@ import org.apache.commons.collections.ResettableIterator;
  * 2.1.1 and 3.1 due to issues with <code>IteratorUtils</code>.
  *
  * @since 2.1.1 and 3.1
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class EmptyIterator<E> extends AbstractEmptyIterator<E> implements ResettableIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyListIterator.java b/src/main/java/org/apache/commons/collections/iterators/EmptyListIterator.java
index cf0ef3bb0..f84d1ae4a 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EmptyListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/EmptyListIterator.java
@@ -28,9 +28,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * due to issues with <code>IteratorUtils</code>.
  *
  * @since 2.1.1 and 3.1
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class EmptyListIterator<E> extends AbstractEmptyIterator<E> implements
         ResettableListIterator<E> {
diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java b/src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
index 9fa247ef3..638d66c94 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
@@ -23,9 +23,7 @@ import org.apache.commons.collections.ResettableIterator;
  * Provides an implementation of an empty map iterator.
  *
  * @since 3.1
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class EmptyMapIterator<K, V> extends AbstractEmptyMapIterator<K, V> implements
         MapIterator<K, V>, ResettableIterator<K> {
diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java b/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
index b6a9b0819..f7e4b8758 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
@@ -23,11 +23,10 @@ import org.apache.commons.collections.ResettableIterator;
  * Provides an implementation of an empty ordered iterator.
  *
  * @since 3.1
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
-public class EmptyOrderedIterator<E> extends AbstractEmptyIterator<E> implements OrderedIterator<E>, ResettableIterator<E> {
+public class EmptyOrderedIterator<E> extends AbstractEmptyIterator<E>
+        implements OrderedIterator<E>, ResettableIterator<E> {
 
     /**
      * Singleton instance of the iterator.
diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java b/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
index 51029ab7f..264315d37 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
@@ -23,12 +23,10 @@ import org.apache.commons.collections.ResettableIterator;
  * Provides an implementation of an empty ordered map iterator.
  *
  * @since 3.1
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
-public class EmptyOrderedMapIterator<K, V> extends AbstractEmptyMapIterator<K, V> implements
-        OrderedMapIterator<K, V>, ResettableIterator<K> {
+public class EmptyOrderedMapIterator<K, V> extends AbstractEmptyMapIterator<K, V>
+        implements OrderedMapIterator<K, V>, ResettableIterator<K> {
 
     /**
      * Singleton instance of the iterator.
diff --git a/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java b/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
index 995f97f95..73b9c7d3d 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
@@ -35,9 +35,7 @@ import org.apache.commons.collections.ResettableIterator;
  * </pre>
  *  
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class EntrySetMapIterator<K, V> implements MapIterator<K, V>, ResettableIterator<K> {
     
diff --git a/src/main/java/org/apache/commons/collections/iterators/EnumerationIterator.java b/src/main/java/org/apache/commons/collections/iterators/EnumerationIterator.java
index 31aab0a04..3d9274bf9 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EnumerationIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/EnumerationIterator.java
@@ -25,10 +25,7 @@ import java.util.Iterator;
  * to be {@link Iterator Iterator} instances.
  *
  * @since 1.0
- * @version $Revision$
- *
- * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
- * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
+ * @version $Id$
  */
 public class EnumerationIterator<E> implements Iterator<E> {
     
diff --git a/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java b/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java
index d1397ee1c..f13216829 100644
--- a/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java
@@ -28,12 +28,7 @@ import org.apache.commons.collections.Predicate;
  * those elements that match the specified {@link Predicate Predicate}.
  *
  * @since 1.0
- * @version $Revision$
- *
- * @author James Strachan
- * @author Jan Sorensen
- * @author Ralph Wagner
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class FilterIterator<E> implements Iterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java b/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java
index 1e84a44d0..d0a11fdd2 100644
--- a/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java
@@ -28,9 +28,7 @@ import org.apache.commons.collections.Predicate;
  * those elements that match the specified {@link Predicate Predicate}.
  *
  * @since 2.0
- * @version $Revision$
- *
- * @author Rodney Waldhoff
+ * @version $Id$
  */
 public class FilterListIterator<E> implements ListIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java b/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java
index 7071d56d9..c22b9a6a7 100644
--- a/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java
+++ b/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java
@@ -44,11 +44,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * this case the class will function as an empty iterator.
  *
  * @since 2.1
- * @version $Revision$
- * 2006) $
- *
- * @author Morgan Delagrange
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class IteratorChain<E> implements Iterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java b/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
index f512e6a46..ed94b3b35 100644
--- a/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
+++ b/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
@@ -24,9 +24,7 @@ import java.util.Iterator;
  * {@link Enumeration Enumeration} instance.
  *
  * @since 1.0
- * @version $Revision$
- *
- * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
+ * @version $Id$
  */
 public class IteratorEnumeration<E> implements Enumeration<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java b/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java
index 585627d89..29559691d 100644
--- a/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java
+++ b/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java
@@ -58,7 +58,7 @@ import org.apache.commons.collections.ResettableIterator;
  * </p>
  * 
  * @since 4.0
- * @version $Revision$
+ * @version $Id$
  */
 public class IteratorIterable<E> implements Iterable<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java b/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
index 692da75b4..581f16ab9 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
+++ b/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.ResettableIterator;
 import org.apache.commons.collections.ResettableListIterator;
 
 /**
@@ -43,11 +42,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * This class implements ResettableListIterator from Commons Collections 3.2.
  *
  * @since 2.1
- * @version $Revision$
- *
- * @author Morgan Delagrange
- * @author Stephen Colebourne
- * @author Matt Benson
+ * @version $Id$
  */
 public class ListIteratorWrapper<E> implements ResettableListIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java b/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java
index d270916b9..95d97c4eb 100644
--- a/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java
@@ -33,10 +33,7 @@ import org.apache.commons.collections.ResettableIterator;
  * implementations will throw a ConcurrentModificationException. 
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author <a href="mailto:joncrlsn@users.sf.net">Jonathan Carlson</a>
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class LoopingIterator<E> implements ResettableIterator<E> {
     
diff --git a/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java b/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java
index 33dfa1f55..f46a256ba 100644
--- a/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java
@@ -35,9 +35,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * ConcurrentModificationException.
  *
  * @since 3.2
- * @version $Revision$
- *
- * @author Eric Crampton <ccesc@eonomine.com>
+ * @version $Id$
  */
 public class LoopingListIterator<E> implements ResettableListIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java b/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
index aa0890919..12698c92a 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
@@ -31,14 +31,7 @@ import org.apache.commons.collections.ResettableIterator;
  * back to the start if required.
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author James Strachan
- * @author Mauricio S. Moura
- * @author Michael A. Smith
- * @author Neil O'Toole
- * @author Stephen Colebourne
- * @author Phil Steitz
+ * @version $Id$
  */
 public class ObjectArrayIterator<E>
         implements Iterator<E>, ResettableIterator<E> {
diff --git a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java b/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
index b5e7a5eff..1b2846cb0 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
@@ -35,11 +35,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * @see java.util.ListIterator
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Neil O'Toole
- * @author Stephen Colebourne
- * @author Phil Steitz
+ * @version $Id$
  */
 public class ObjectArrayListIterator<E> extends ObjectArrayIterator<E>
         implements ListIterator<E>, ResettableListIterator<E> {
diff --git a/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java b/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
index 34e8dd3da..d6c93f334 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
@@ -71,9 +71,7 @@ import org.apache.commons.collections.Transformer;
  * more efficient (and convenient) than using nested for loops to extract a list.
  *
  * @since 3.1
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class ObjectGraphIterator<E> implements Iterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java b/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java
index 49348753c..d8eb42b26 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java
@@ -33,10 +33,8 @@ import org.apache.commons.collections.ResettableListIterator;
  * index in the list, thus it starts high and reduces as the iteration
  * continues. The previous methods work similarly.
  *
- * @author Serge Knystautas
- * @author Stephen Colebourne
  * @since 3.2
- * @version $Revision$
+ * @version $Id$
  */
 public class ReverseListIterator<E> implements ResettableListIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java b/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java
index 10d0eb6f7..d4ed5ea02 100644
--- a/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java
@@ -26,11 +26,7 @@ import org.apache.commons.collections.ResettableIterator;
  * object instance.
  *
  * @since 2.0
- * @version $Revision$
- *
- * @author James Strachan
- * @author Stephen Colebourne
- * @author Rodney Waldhoff
+ * @version $Id$
  */
 public class SingletonIterator<E>
         implements Iterator<E>, ResettableIterator<E> {
diff --git a/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java b/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java
index cdd7303ad..0cfbfca5c 100644
--- a/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java
@@ -26,10 +26,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * object instance.
  *
  * @since 2.1
- * @version $Revision$
- *
- * @author Stephen Colebourne
- * @author Rodney Waldhoff
+ * @version $Id$
  */
 public class SingletonListIterator<E> implements ListIterator<E>, ResettableListIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java b/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java
index 4d0ee4612..63ee522ff 100644
--- a/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java
@@ -24,10 +24,7 @@ import org.apache.commons.collections.Transformer;
  * Decorates an iterator such that each element returned is transformed.
  *
  * @since 1.0
- * @version $Revision$
- *
- * @author James Strachan
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public class TransformIterator<I, O> implements Iterator<O> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java b/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
index 898de79e8..dd3fd22f2 100644
--- a/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
@@ -26,9 +26,7 @@ import org.apache.commons.collections.functors.UniquePredicate;
  * and duplicate Objects are skipped.
  *
  * @since 2.1
- * @version $Revision$
- *
- * @author Morgan Delagrange
+ * @version $Id$
  */
 public class UniqueFilterIterator<E> extends FilterIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
index 99744df6a..f8eed44f9 100644
--- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
@@ -26,9 +26,7 @@ import org.apache.commons.collections.Unmodifiable;
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class UnmodifiableIterator<E> implements Iterator<E>, Unmodifiable {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
index 330977b32..93888211a 100644
--- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
@@ -26,9 +26,7 @@ import org.apache.commons.collections.Unmodifiable;
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class UnmodifiableListIterator<E> implements ListIterator<E>, Unmodifiable {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
index 2a5403b9f..285d71086 100644
--- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
@@ -25,9 +25,7 @@ import org.apache.commons.collections.Unmodifiable;
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class UnmodifiableMapIterator<K, V> implements MapIterator<K, V>, Unmodifiable {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
index fa95db522..ecc4c9399 100644
--- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
@@ -25,9 +25,7 @@ import org.apache.commons.collections.Unmodifiable;
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
  * @since 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
  */
 public final class UnmodifiableOrderedMapIterator<K, V> implements OrderedMapIterator<K, V>,
         Unmodifiable {
diff --git a/src/main/java/org/apache/commons/collections/iterators/package-info.java b/src/main/java/org/apache/commons/collections/iterators/package-info.java
new file mode 100644
index 000000000..1f3561005
--- /dev/null
+++ b/src/main/java/org/apache/commons/collections/iterators/package-info.java
@@ -0,0 +1,28 @@
+/*
+ * 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 java.util.Iterator Iterator} interface.
+ * <p>
+ * You may also consider using 
+ * {@link org.apache.commons.collections.IteratorUtils IteratorUtils},
+ * which is a single class that uses static methods to construct instances
+ * of the classes in this package.
+ *
+ * @version $Id$
+ */
+package org.apache.commons.collections.iterators;
diff --git a/src/main/java/org/apache/commons/collections/iterators/package.html b/src/main/java/org/apache/commons/collections/iterators/package.html
deleted file mode 100644
index 1e8e7dbb7..000000000
--- a/src/main/java/org/apache/commons/collections/iterators/package.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- $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 java.util.Iterator Iterator} interface.
-<p>
-You may also consider using 
-{@link org.apache.commons.collections.IteratorUtils IteratorUtils},
-which is a single class that uses static methods to construct instances
-of the classes in this package.
-</body>