jvanzyl 00/10/12 07:56:22
Added: src/java/org/apache/velocity/util ArrayIterator.java
Removed: src/java/org/apache/velocity/util ArrayEnumerator.java
Log:
- removed array enumerator as we're doing 1.2 and replaced it
with ArrayIterator. Might detected whether an object going
into the context is an Object[] and put an ArrayIterator
wrapper around it so the only thing that has to be dealt
with in the #foreach is an iterator.
Revision Changes Path
1.1
jakarta-velocity/src/java/org/apache/velocity/util/ArrayIterator.java
Index: ArrayIterator.java
===================================================================
package org.apache.velocity.util;
/*
* $Header:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/util/ArrayIterator.java,v 1.1
2000/10/12 14:56:21 jvanzyl Exp $
* $Revision: 1.1 $
* $Date: 2000/10/12 14:56:21 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* [Additional notices, if required by prior licensing conditions]
*
*/
import java.util.Iterator;
import java.util.NoSuchElementException;
// Added to avoid the conversion of [] to Vector - reduce garbage + cleaner
// code is similar to VectorEnumeration in java.util.Vector
public class ArrayIterator implements Iterator
{
Object array[];
int pos;
public ArrayIterator(Object array[])
{
this.array = array;
pos = 0;
}
public Object next()
{
synchronized (array)
{
if (pos < array.length)
return array[pos ++];
}
throw new NoSuchElementException("No more elements: " + pos +
" / " + array.length);
}
public boolean hasNext()
{
return pos < array.length;
}
public void remove()
{
}
}
