cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections TestArrayIterator.java

[jstrachan]

jstrachan    01/08/23 03:50:01

  Modified:    collections/src/java/org/apache/commons/collections
                        ArrayIterator.java
               collections/src/test/org/apache/commons/collections
                        TestArrayIterator.java
  Log:
  Backed out ArrayIterator change to use reflection rather than use Object[]
  
  Revision  Changes    Path
  1.5       +7 -8      
jakarta-commons/collections/src/java/org/apache/commons/collections/ArrayIterator.java
  
  Index: ArrayIterator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/ArrayIterator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ArrayIterator.java        2001/08/23 09:05:26     1.4
  +++ ArrayIterator.java        2001/08/23 10:50:01     1.5
  @@ -7,7 +7,6 @@
    */
   package org.apache.commons.collections;
   
  -import java.lang.reflect.Array;
   import java.util.Iterator;
   import java.util.NoSuchElementException;
   
  @@ -16,32 +15,32 @@
     * @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
     * @author Mauricio S. Moura
     * @
  -  * @version $Revision: 1.4 $
  +  * @version $Revision: 1.5 $
     */
   public class ArrayIterator implements Iterator {
       
  -    private Object array;
  +    private Object[] array;
       private int index = 0;
     
       
       public ArrayIterator() {
       }
       
  -    public ArrayIterator(Object array) {
  +    public ArrayIterator(Object[] array) {
           this.array = array;
       }
   
       // Iterator interface
       //-------------------------------------------------------------------------
       public boolean hasNext() {
  -        return  index < Array.getLength( array );
  +        return  index < array.length;
       }
   
       public Object next() {
           if(!hasNext()) {
               throw new NoSuchElementException();
           }
  -        return Array.get( array, index++ );
  +        return array[ index++ ];
       }
   
       public void remove() {
  @@ -50,11 +49,11 @@
   
       // Properties
       //-------------------------------------------------------------------------
  -    public Object getArray() {
  +    public Object[] getArray() {
           return array;
       }
       
  -    public void setArray( Object array ) {
  +    public void setArray( Object[] array ) {
           this.array = array;
           this.index = -1;
       }
  
  
  
  1.4       +5 -5      
jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayIterator.java
  
  Index: TestArrayIterator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayIterator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestArrayIterator.java    2001/07/14 23:33:26     1.3
  +++ TestArrayIterator.java    2001/08/23 10:50:01     1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayIterator.java,v
 1.3 2001/07/14 23:33:26 craigmcc Exp $
  - * $Revision: 1.3 $
  - * $Date: 2001/07/14 23:33:26 $
  + * $Header: 
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayIterator.java,v
 1.4 2001/08/23 10:50:01 jstrachan Exp $
  + * $Revision: 1.4 $
  + * $Date: 2001/08/23 10:50:01 $
    *
    * ====================================================================
    *
  @@ -72,7 +72,7 @@
    *
    * @author James Strachan
    * @author Mauricio S. Moura
  - * @version $Id: TestArrayIterator.java,v 1.3 2001/07/14 23:33:26 craigmcc Exp $
  + * @version $Id: TestArrayIterator.java,v 1.4 2001/08/23 10:50:01 jstrachan Exp $
    */
   public class TestArrayIterator extends TestObject {
       
  @@ -92,7 +92,7 @@
        * Return a new, empty {@link Object} to used for testing.
        */
       public Object makeObject() {
  -        return new ArrayIterator(testArray);
  +        return new ArrayIterator( (Object[]) testArray );
       }
       
       public void testIterator() {