diff --git a/src/java/org/apache/commons/collections/CollectionUtils.java b/src/java/org/apache/commons/collections/CollectionUtils.java
index e8ee99502..2d79d149b 100644
--- a/src/java/org/apache/commons/collections/CollectionUtils.java
+++ b/src/java/org/apache/commons/collections/CollectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/CollectionUtils.java,v 1.53 2004/01/05 22:46:33 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/CollectionUtils.java,v 1.54 2004/01/08 22:26:07 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -74,14 +74,12 @@ import org.apache.commons.collections.collection.TransformedCollection;
 import org.apache.commons.collections.collection.TypedCollection;
 import org.apache.commons.collections.collection.UnmodifiableBoundedCollection;
 import org.apache.commons.collections.collection.UnmodifiableCollection;
-import org.apache.commons.collections.iterators.ArrayIterator;
-import org.apache.commons.collections.iterators.EnumerationIterator;
 
 /**
  * Provides utility methods and decorators for {@link Collection} instances.
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.53 $ $Date: 2004/01/05 22:46:33 $
+ * @version $Revision: 1.54 $ $Date: 2004/01/08 22:26:07 $
  * 
  * @author Rodney Waldhoff
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/DefaultMapBag.java b/src/java/org/apache/commons/collections/DefaultMapBag.java
index 53deab875..d78051228 100644
--- a/src/java/org/apache/commons/collections/DefaultMapBag.java
+++ b/src/java/org/apache/commons/collections/DefaultMapBag.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/DefaultMapBag.java,v 1.13 2003/12/24 23:22:54 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/DefaultMapBag.java,v 1.14 2004/01/08 22:26:07 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -80,7 +80,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  *
  * @deprecated Moved to bag subpackage as AbstractMapBag. Due to be removed in v4.0.
  * @since Commons Collections 2.0
- * @version $Revision: 1.13 $ $Date: 2003/12/24 23:22:54 $
+ * @version $Revision: 1.14 $ $Date: 2004/01/08 22:26:07 $
  * 
  * @author Chuck Burdick
  * @author Michael A. Smith
@@ -198,7 +198,7 @@ public abstract class DefaultMapBag implements Bag {
         Iterator i = other.uniqueSet().iterator();
         while (i.hasNext()) {
             Object current = i.next();
-            boolean contains = getCount(current) >= ((Bag) other).getCount(current);
+            boolean contains = getCount(current) >= other.getCount(current);
             result = result && contains;
         }
         return result;
diff --git a/src/java/org/apache/commons/collections/DoubleOrderedMap.java b/src/java/org/apache/commons/collections/DoubleOrderedMap.java
index bb92e36ef..30382291f 100644
--- a/src/java/org/apache/commons/collections/DoubleOrderedMap.java
+++ b/src/java/org/apache/commons/collections/DoubleOrderedMap.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/DoubleOrderedMap.java,v 1.11 2004/01/06 22:07:47 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/DoubleOrderedMap.java,v 1.12 2004/01/08 22:26:07 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -141,7 +141,7 @@ import java.util.Set;
  * @see org.apache.commons.collections.bidimap.DualTreeBidiMap
  * @see org.apache.commons.collections.bidimap.DualHashBidiMap
  * @since Commons Collections 2.0
- * @version $Revision: 1.11 $ $Date: 2004/01/06 22:07:47 $
+ * @version $Revision: 1.12 $ $Date: 2004/01/08 22:26:07 $
  * 
  * @author Marc Johnson
  */
@@ -535,7 +535,7 @@ public final class DoubleOrderedMap extends AbstractMap {
      *         value if o1 > o2
      */
     private static int compare(final Comparable o1, final Comparable o2) {
-        return ((Comparable) o1).compareTo(o2);
+        return o1.compareTo(o2);
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/OrderedMap.java b/src/java/org/apache/commons/collections/OrderedMap.java
index 635f3ed2a..d3173a4da 100644
--- a/src/java/org/apache/commons/collections/OrderedMap.java
+++ b/src/java/org/apache/commons/collections/OrderedMap.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/OrderedMap.java,v 1.3 2003/12/02 23:51:49 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/OrderedMap.java,v 1.4 2004/01/08 22:26:07 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -62,7 +62,7 @@ package org.apache.commons.collections;
  * iteration through that order.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2003/12/02 23:51:49 $
+ * @version $Revision: 1.4 $ $Date: 2004/01/08 22:26:07 $
  *
  * @author Stephen Colebourne
  */
@@ -92,7 +92,7 @@ public interface OrderedMap extends IterableMap {
      * Gets the first key currently in this map.
      *
      * @return the first key currently in this map
-     * @throws NoSuchElementException if this map is empty
+     * @throws java.util.NoSuchElementException if this map is empty
      */
     public Object firstKey();
 
@@ -100,7 +100,7 @@ public interface OrderedMap extends IterableMap {
      * Gets the last key currently in this map.
      *
      * @return the last key currently in this map
-     * @throws NoSuchElementException if this map is empty
+     * @throws java.util.NoSuchElementException if this map is empty
      */
     public Object lastKey();
     
diff --git a/src/java/org/apache/commons/collections/OrderedMapIterator.java b/src/java/org/apache/commons/collections/OrderedMapIterator.java
index 8f74d0c3f..ad3b808ee 100644
--- a/src/java/org/apache/commons/collections/OrderedMapIterator.java
+++ b/src/java/org/apache/commons/collections/OrderedMapIterator.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/OrderedMapIterator.java,v 1.1 2003/12/01 22:48:59 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/OrderedMapIterator.java,v 1.2 2004/01/08 22:26:07 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -63,7 +63,7 @@ package org.apache.commons.collections;
  * This iterator allows both forward and reverse iteration through the map.
  *  
  * @since Commons Collections 3.0
- * @version $Revision: 1.1 $ $Date: 2003/12/01 22:48:59 $
+ * @version $Revision: 1.2 $ $Date: 2004/01/08 22:26:07 $
  *
  * @author Stephen Colebourne
  */
@@ -80,7 +80,7 @@ public interface OrderedMapIterator extends MapIterator, OrderedIterator {
      * Gets the previous <em>key</em> from the <code>Map</code>.
      *
      * @return the previous key in the iteration
-     * @throws NoSuchElementException if the iteration is finished
+     * @throws java.util.NoSuchElementException if the iteration is finished
      */
     Object previous();
 
diff --git a/src/java/org/apache/commons/collections/PriorityQueue.java b/src/java/org/apache/commons/collections/PriorityQueue.java
index 6920924cf..4b66f7d70 100644
--- a/src/java/org/apache/commons/collections/PriorityQueue.java
+++ b/src/java/org/apache/commons/collections/PriorityQueue.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/PriorityQueue.java,v 1.11 2004/01/06 21:31:32 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/PriorityQueue.java,v 1.12 2004/01/08 22:26:07 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -65,7 +65,7 @@ package org.apache.commons.collections;
  * @deprecated Replaced by the Buffer interface and implementations in buffer subpackage.
  *  Due to be removed in v4.0.
  * @since Commons Collections 1.0
- * @version $Revision: 1.11 $ $Date: 2004/01/06 21:31:32 $
+ * @version $Revision: 1.12 $ $Date: 2004/01/08 22:26:07 $
  * 
  * @author Peter Donald
  */
@@ -98,7 +98,7 @@ public interface PriorityQueue {
      * Return element on top of heap but don't remove it.
      *
      * @return the element at top of heap
-     * @throws NoSuchElementException if <code>isEmpty() == true</code>
+     * @throws java.util.NoSuchElementException if <code>isEmpty() == true</code>
      */
     Object peek();
 
@@ -106,7 +106,7 @@ public interface PriorityQueue {
      * Return element on top of heap and remove it.
      *
      * @return the element at top of heap
-     * @throws NoSuchElementException if <code>isEmpty() == true</code>
+     * @throws java.util.NoSuchElementException if <code>isEmpty() == true</code>
      */
     Object pop();
     
diff --git a/src/java/org/apache/commons/collections/bag/AbstractMapBag.java b/src/java/org/apache/commons/collections/bag/AbstractMapBag.java
index 6ce629081..5ebd0d23b 100644
--- a/src/java/org/apache/commons/collections/bag/AbstractMapBag.java
+++ b/src/java/org/apache/commons/collections/bag/AbstractMapBag.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bag/AbstractMapBag.java,v 1.10 2004/01/02 01:36:51 psteitz Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bag/AbstractMapBag.java,v 1.11 2004/01/08 22:26:08 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -79,7 +79,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * the number of occurrences of that element in the bag.
  *
  * @since Commons Collections 3.0 (previously DefaultMapBag v2.0)
- * @version $Revision: 1.10 $ $Date: 2004/01/02 01:36:51 $
+ * @version $Revision: 1.11 $ $Date: 2004/01/08 22:26:08 $
  * 
  * @author Chuck Burdick
  * @author Michael A. Smith
@@ -196,7 +196,7 @@ public abstract class AbstractMapBag implements Bag {
         Iterator it = other.uniqueSet().iterator();
         while (it.hasNext()) {
             Object current = it.next();
-            boolean contains = getCount(current) >= ((Bag) other).getCount(current);
+            boolean contains = getCount(current) >= other.getCount(current);
             result = result && contains;
         }
         return result;
diff --git a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
index fc4061c26..0d4b4f163 100644
--- a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java,v 1.7 2004/01/02 01:36:51 psteitz Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java,v 1.8 2004/01/08 22:26:08 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -108,7 +108,7 @@ import org.apache.commons.collections.keyvalue.UnmodifiableMapEntry;
  * UnsupportedOperationException on attempts to call that method.
  *
  * @since Commons Collections 3.0 (previously DoubleOrderedMap v2.0)
- * @version $Revision: 1.7 $ $Date: 2004/01/02 01:36:51 $
+ * @version $Revision: 1.8 $ $Date: 2004/01/08 22:26:08 $
  * 
  * @author Marc Johnson
  * @author Stephen Colebourne
@@ -712,11 +712,11 @@ public class TreeBidiMap implements OrderedBidiMap {
      * @param o1  the first object
      * @param o2  the second object
      *
-     * @return negative value if o1 < o2; 0 if o1 == o2; positive
-     *         value if o1 > o2
+     * @return negative value if o1 &lt; o2; 0 if o1 == o2; positive
+     *         value if o1 &gt; o2
      */
     private static int compare(final Comparable o1, final Comparable o2) {
-        return ((Comparable) o1).compareTo(o2);
+        return o1.compareTo(o2);
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/collection/TransformedCollection.java b/src/java/org/apache/commons/collections/collection/TransformedCollection.java
index 95c7644ce..66407b242 100644
--- a/src/java/org/apache/commons/collections/collection/TransformedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/TransformedCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/collection/TransformedCollection.java,v 1.1 2003/11/16 00:05:47 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/collection/TransformedCollection.java,v 1.2 2004/01/08 22:26:07 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -73,7 +73,7 @@ import org.apache.commons.collections.Transformer;
  * use the Integer form to remove objects.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:47 $
+ * @version $Revision: 1.2 $ $Date: 2004/01/08 22:26:07 $
  * 
  * @author Stephen Colebourne
  */
@@ -121,7 +121,7 @@ public class TransformedCollection extends AbstractCollectionDecorator {
      * The transformer itself may throw an exception if necessary.
      * 
      * @param object  the object to transform
-     * @throws the transformed object
+     * @return a transformed object
      */
     protected Object transform(Object object) {
         return transformer.transform(object);
@@ -133,7 +133,7 @@ public class TransformedCollection extends AbstractCollectionDecorator {
      * The transformer itself may throw an exception if necessary.
      * 
      * @param coll  the collection to transform
-     * @throws the transformed object
+     * @return a transformed object
      */
     protected Collection transform(Collection coll) {
         List list = new ArrayList(coll.size());
diff --git a/src/java/org/apache/commons/collections/functors/PrototypeFactory.java b/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
index 6152dbde6..d9e035bc2 100644
--- a/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
+++ b/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/functors/PrototypeFactory.java,v 1.3 2003/12/29 01:18:23 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/functors/PrototypeFactory.java,v 1.4 2004/01/08 22:26:07 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -73,7 +73,7 @@ import org.apache.commons.collections.FunctorException;
  * Factory implementation that creates a new instance each time based on a prototype.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2003/12/29 01:18:23 $
+ * @version $Revision: 1.4 $ $Date: 2004/01/08 22:26:07 $
  *
  * @author Stephen Colebourne
  */
@@ -124,8 +124,6 @@ public class PrototypeFactory {
     /**
      * Constructor that performs no validation.
      * Use <code>getInstance</code> if you want that.
-     * 
-     * @param constantToReturn  the constant to return each time
      */
     private PrototypeFactory() {
     }
diff --git a/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java b/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
index 922758f6d..49c110386 100644
--- a/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java,v 1.4 2003/12/01 22:48:59 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java,v 1.5 2004/01/08 22:26:07 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -76,7 +76,7 @@ import org.apache.commons.collections.ResettableIterator;
  * </pre>
  *  
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2003/12/01 22:48:59 $
+ * @version $Revision: 1.5 $ $Date: 2004/01/08 22:26:07 $
  *
  * @author Stephen Colebourne
  */
@@ -112,7 +112,7 @@ public class EntrySetMapIterator implements MapIterator, ResettableIterator {
      * Gets the next <em>key</em> from the <code>Map</code>.
      *
      * @return the next key in the iteration
-     * @throws NoSuchElementException if the iteration is finished
+     * @throws java.util.NoSuchElementException if the iteration is finished
      */
     public Object next() {
         last = (Map.Entry) iterator.next();
diff --git a/src/java/org/apache/commons/collections/iterators/IteratorChain.java b/src/java/org/apache/commons/collections/iterators/IteratorChain.java
index 93eb553d0..362d04ba3 100644
--- a/src/java/org/apache/commons/collections/iterators/IteratorChain.java
+++ b/src/java/org/apache/commons/collections/iterators/IteratorChain.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/IteratorChain.java,v 1.8 2003/12/29 16:07:53 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/IteratorChain.java,v 1.9 2004/01/08 22:26:07 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -85,7 +85,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * iterators. In this case the class will function as an empty iterator.
  * 
  * @since Commons Collections 2.1
- * @version $Revision: 1.8 $ $Date: 2003/12/29 16:07:53 $
+ * @version $Revision: 1.9 $ $Date: 2004/01/08 22:26:07 $
  * 
  * @author Morgan Delagrange
  * @author Stephen Colebourne
@@ -297,7 +297,7 @@ public class IteratorChain implements Iterator {
      * Returns the next Object of the current Iterator
      * 
      * @return Object from the current Iterator
-     * @throws NoSuchElementException if all the Iterators are exhausted
+     * @throws java.util.NoSuchElementException if all the Iterators are exhausted
      */
     public Object next() {
         lockChain();
diff --git a/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java b/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
index 735727096..1dcaf57bc 100644
--- a/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
+++ b/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java,v 1.5 2003/10/28 02:44:51 ggregory Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java,v 1.6 2004/01/08 22:26:07 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -64,7 +64,7 @@ import java.util.Iterator;
  * Adapter to make an {@link Iterator Iterator} instance appear to be an {@link Enumeration Enumeration} instance.
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.5 $ $Date: 2003/10/28 02:44:51 $
+ * @version $Revision: 1.6 $ $Date: 2004/01/08 22:26:07 $
  * 
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  */
@@ -108,7 +108,7 @@ public class IteratorEnumeration implements Enumeration {
      *  Returns the next element from the underlying iterator.
      *
      *  @return the next element from the underlying iterator.
-     *  @throws NoSuchElementException  if the underlying iterator has no
+     *  @throws java.util.NoSuchElementException  if the underlying iterator has no
      *    more elements
      */
     public Object nextElement() {
diff --git a/src/java/org/apache/commons/collections/iterators/ProxyIterator.java b/src/java/org/apache/commons/collections/iterators/ProxyIterator.java
index 70407b3d0..29247155f 100644
--- a/src/java/org/apache/commons/collections/iterators/ProxyIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ProxyIterator.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ProxyIterator.java,v 1.7 2004/01/04 18:04:16 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ProxyIterator.java,v 1.8 2004/01/08 22:26:07 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -64,7 +64,7 @@ import java.util.Iterator;
  *
  * @deprecated Use AbstractIteratorDecorator. Will be removed in v4.0
  * @since Commons Collections 1.0
- * @version $Revision: 1.7 $ $Date: 2004/01/04 18:04:16 $
+ * @version $Revision: 1.8 $ $Date: 2004/01/08 22:26:07 $
  * 
  * @author James Strachan
  */
@@ -111,7 +111,7 @@ public class ProxyIterator implements Iterator {
      *  Returns the next element from the underlying iterator.
      *
      *  @return the next element from the underlying iterator
-     *  @throws NoSuchElementException  if the underlying iterator 
+     *  @throws java.util.NoSuchElementException  if the underlying iterator 
      *    raises it because it has no more elements
      */
     public Object next() {
diff --git a/src/java/org/apache/commons/collections/iterators/TransformIterator.java b/src/java/org/apache/commons/collections/iterators/TransformIterator.java
index 93ef2bf85..f390e11ac 100644
--- a/src/java/org/apache/commons/collections/iterators/TransformIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/TransformIterator.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/TransformIterator.java,v 1.6 2003/11/02 16:29:12 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/TransformIterator.java,v 1.7 2004/01/08 22:26:07 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -65,7 +65,7 @@ import org.apache.commons.collections.Transformer;
  * Decorates an iterator such that each element returned is transformed.
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.6 $ $Date: 2003/11/02 16:29:12 $
+ * @version $Revision: 1.7 $ $Date: 2004/01/08 22:26:07 $
  * 
  * @author James Strachan
  * @author Stephen Colebourne
@@ -123,7 +123,7 @@ public class TransformIterator implements Iterator {
      * occurs and the object from the iterator is returned directly.
      * 
      * @return the next object
-     * @throws NoSuchElementException if there are no more elements
+     * @throws java.util.NoSuchElementException if there are no more elements
      */
     public Object next() {
         return transform(iterator.next());
diff --git a/src/java/org/apache/commons/collections/map/ReferenceMap.java b/src/java/org/apache/commons/collections/map/ReferenceMap.java
index b5db121f6..a534a5fc7 100644
--- a/src/java/org/apache/commons/collections/map/ReferenceMap.java
+++ b/src/java/org/apache/commons/collections/map/ReferenceMap.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/ReferenceMap.java,v 1.7 2004/01/05 22:15:14 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/ReferenceMap.java,v 1.8 2004/01/08 22:26:07 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -119,7 +119,7 @@ import org.apache.commons.collections.keyvalue.DefaultMapEntry;
  * @see java.lang.ref.Reference
  * 
  * @since Commons Collections 3.0 (previously in main package v2.1)
- * @version $Revision: 1.7 $ $Date: 2004/01/05 22:15:14 $
+ * @version $Revision: 1.8 $ $Date: 2004/01/08 22:26:07 $
  * 
  * @author Paul Jack
  */
@@ -353,7 +353,7 @@ public class ReferenceMap extends AbstractMap {
     /**
      *  Reads the contents of this object from the given input stream.
      *
-     *  @param inp  the input stream to read from
+     *  @param in  the input stream to read from
      *  @throws IOException  if the stream raises it
      *  @throws ClassNotFoundException  if the stream raises it
      */
@@ -640,7 +640,7 @@ public class ReferenceMap extends AbstractMap {
     public void clear() {
         Arrays.fill(table, null);
         size = 0;
-        while (queue.poll() != null) {}; // drain the queue
+        while (queue.poll() != null) {} // drain the queue
     }
 
 
diff --git a/src/java/org/apache/commons/collections/set/ListOrderedSet.java b/src/java/org/apache/commons/collections/set/ListOrderedSet.java
index ea5b8a877..2fdbc4629 100644
--- a/src/java/org/apache/commons/collections/set/ListOrderedSet.java
+++ b/src/java/org/apache/commons/collections/set/ListOrderedSet.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/set/ListOrderedSet.java,v 1.3 2003/12/25 00:50:10 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/set/ListOrderedSet.java,v 1.4 2004/01/08 22:26:07 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -84,7 +84,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * various interface methods (notably equals/hashCode) are incompatable with a set.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2003/12/25 00:50:10 $
+ * @version $Revision: 1.4 $ $Date: 2004/01/08 22:26:07 $
  * 
  * @author Stephen Colebourne
  * @author Henning P. Schmiedehausen
@@ -214,7 +214,7 @@ public class ListOrderedSet extends AbstractSetDecorator implements Set {
             setOrder.clear();
         } else {
             for (Iterator it = setOrder.iterator(); it.hasNext();) {
-                Object object = (Object) it.next();
+                Object object = it.next();
                 if (collection.contains(object) == false) {
                     it.remove();
                 }
@@ -250,7 +250,7 @@ public class ListOrderedSet extends AbstractSetDecorator implements Set {
     public boolean addAll(int index, Collection coll) {
         boolean changed = false;
         for (Iterator it = coll.iterator(); it.hasNext();) {
-            Object object = (Object) it.next();
+            Object object = it.next();
             if (contains(object) == false) {
                 collection.add(object);
                 setOrder.add(index, object);