/*
 *  Licensed to the Apache Software Foundation (ASF) under one
 *  or more contributor license agreements.  See the NOTICE file
 *  distributed with this work for additional information
 *  regarding copyright ownership.  The ASF licenses this file
 *  to you under the Apache License, Version 2.0 (the
 *  "License"); you may not use this file except in compliance
 *  with the License.  You may obtain a copy of the License at
 *
 *    http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing,
 *  software distributed under the License is distributed on an
 *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 *  KIND, either express or implied.  See the License for the
 *  specific language governing permissions and limitations
 *  under the License.
 */
package org.codehaus.groovy.util;

import java.lang.reflect.Array;
import java.util.Iterator;

public class ArrayIterator<T> implements Iterator<T> {
    private final T[] array;
    private final int length;
    private int index;

    public ArrayIterator(T[] array) {
        this.array = array;
        length = Array.getLength(array);
    }

    public boolean hasNext() {
        return index < length;
    }

    @SuppressWarnings("unchecked")
    public T next() {
        return (T) Array.get(array, index++);
    }

    public void remove() {
        throw new UnsupportedOperationException("Remove not supported for arrays");
    }
}

@@ -908,16 +908,57 @@
 terator;
+%0Aimport java.util.NoSuchElementException;
 %0A%0Apublic
@@ -1321,32 +1321,116 @@
 blic T next() %7B%0A
+        if (!hasNext()) %7B%0A            throw new NoSuchElementException();%0A        %7D%0A
         return (

fix spotbugs warning (throw NoSuchElementException rather than ArrayIndexOutOfBoundsException when accessing exhausted iterator)