Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

If object is not an array, fail on from the constructor or from 

setArray rather than from hasNext or next.  This gives a more
fail-fast behavior.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130656 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Smith 2002-03-19 00:54:34 +00:00
parent 655353ba07
commit 25e0dd13fd
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/java/org/apache/commons/collections/ArrayIterator.java
View File

@ -1,7 +1,7 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/ArrayIterator.java,v 1.10 2002/03/19 00:05:10 morgand Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/ArrayIterator.java,v 1.11 2002/03/19 00:54:34 mas Exp $
* $Revision: 1.10 $ * $Revision: 1.11 $
* $Date: 2002/03/19 00:05:10 $ * $Date: 2002/03/19 00:54:34 $
* *
* ==================================================================== * ====================================================================
* *
@ -68,11 +68,13 @@ import java.util.NoSuchElementException;
* *
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a> * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @author Mauricio S. Moura * @author Mauricio S. Moura
* @version $Revision: 1.10 $ * @author <a href="mailto:mas@apache.org">Michael A. Smith</a>
* @version $Revision: 1.11 $
*/ */
public class ArrayIterator implements Iterator { public class ArrayIterator implements Iterator {
private Object array; private Object array;
private int length = 0;
private int index = 0; private int index = 0;
@ -80,13 +82,13 @@ public class ArrayIterator implements Iterator {
} }
public ArrayIterator(Object array) { public ArrayIterator(Object array) {
this.array = array; setArray( array );
} }
// Iterator interface // Iterator interface
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
public boolean hasNext() { public boolean hasNext() {
return index < Array.getLength( array ); return index < length;
} }
public Object next() { public Object next() {
@ -106,7 +108,16 @@ public class ArrayIterator implements Iterator {
return array; return array;
} }
/**
* @exception IllegalArgumentException if <code>array</code> is not an
* array.
**/
public void setArray( Object array ) { public void setArray( Object array ) {
// Array.getLength throws IllegalArgumentException if the object is not
// an array. This call is made before saving the array and resetting
// the index so that the array iterator remains in a consistent state
// if the argument is not an array.
this.length = Array.getLength( array );
this.array = array; this.array = array;
this.index = 0; this.index = 0;
} }