diff --git a/src/java/org/apache/commons/collections/DualHashBidiMap.java b/src/java/org/apache/commons/collections/DualHashBidiMap.java index 58412fb63..ee417bf24 100644 --- a/src/java/org/apache/commons/collections/DualHashBidiMap.java +++ b/src/java/org/apache/commons/collections/DualHashBidiMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/DualHashBidiMap.java,v 1.2 2003/10/09 20:21:32 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/DualHashBidiMap.java,v 1.3 2003/10/10 21:06:17 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -68,7 +68,7 @@ import java.util.Map; * Implementation of BidiMap that uses two HashMap instances. * * @since Commons Collections 3.0 - * @version $Id: DualHashBidiMap.java,v 1.2 2003/10/09 20:21:32 scolebourne Exp $ + * @version $Id: DualHashBidiMap.java,v 1.3 2003/10/10 21:06:17 scolebourne Exp $ * * @author Matthew Hawthorne * @author Stephen Colebourne @@ -124,8 +124,8 @@ public class DualHashBidiMap extends AbstractDualBidiMap implements Serializable * @param inverseBidiMap the inverse BidiMap * @return new bidi map */ - protected BidiMap createBidiMap(Map normalMap, Map reverseMap, BidiMap inverseMap) { - return new DualHashBidiMap(normalMap, reverseMap, inverseMap); + protected BidiMap createBidiMap(Map normalMap, Map reverseMap, BidiMap inverseBidiMap) { + return new DualHashBidiMap(normalMap, reverseMap, inverseBidiMap); } // Serialization diff --git a/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java b/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java index 46814760e..efac56be7 100644 --- a/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java +++ b/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.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/ObjectArrayIterator.java,v 1.7 2003/09/29 03:56:12 psteitz Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java,v 1.8 2003/10/10 21:06:18 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -57,6 +57,7 @@ */ package org.apache.commons.collections.iterators; +import java.util.Iterator; import java.util.NoSuchElementException; /** @@ -69,16 +70,17 @@ import java.util.NoSuchElementException; * back to the start if required. * * @since Commons Collections 3.0 - * @version $Revision: 1.7 $ $Date: 2003/09/29 03:56:12 $ + * @version $Revision: 1.8 $ $Date: 2003/10/10 21:06:18 $ * - * @author James Strachan + * @author James Strachan * @author Mauricio S. Moura - * @author Michael A. Smith - * @author Neil O'Toole + * @author Michael A. Smith + * @author Neil O'Toole * @author Stephen Colebourne * @author Phil Steitz */ -public class ObjectArrayIterator implements ResetableIterator { +public class ObjectArrayIterator + implements Iterator, ResetableIterator { /** The array */ protected Object[] array = null;