/*
 * 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.apache.jackrabbit.commons.iterator;

import java.util.Collection;
import java.util.Iterator;
import java.util.NoSuchElementException;

import javax.jcr.RangeIterator;
import javax.jcr.query.Row;
import javax.jcr.query.RowIterator;

import org.apache.jackrabbit.commons.predicate.Predicate;

/**
 * Adapter class for turning {@link RangeIterator}s or {@link Iterator}s
 * into {@link RowIterator}s.
 */
public class RowIteratorAdapter extends RangeIteratorDecorator
        implements RowIterator {

    /**
     * Static instance of an empty {@link RowIterator}.
     */
    public static final RowIterator EMPTY =
        new RowIteratorAdapter(RangeIteratorAdapter.EMPTY);

    /**
     * Creates an adapter for the given {@link RangeIterator}.
     *
     * @param iterator iterator of {@link Row}s
     */
    public RowIteratorAdapter(RangeIterator iterator) {
        super(iterator);
    }

    /**
     * Creates an adapter for the given {@link Iterator}.
     *
     * @param iterator iterator of {@link Row}s
     */
    public RowIteratorAdapter(Iterator<?> iterator) {
        super(RangeIteratorAdapter.adapt(iterator));
    }

    /**
     * Creates a filtered adapter for the given {@link Iterator}
     * and {@link Predicate).
     *
     * @since Apache Jackrabbit 2.2
     * @param iterator row iterator
     * @param predicate filtering predicate
     */
    public RowIteratorAdapter(Iterator<?> iterator, Predicate predicate) {
        super(new FilteredRangeIterator(iterator, predicate));
    }

    /**
     * Creates an iterator for the given collection.
     *
     * @param collection collection of {@link Row}s
     */
    public RowIteratorAdapter(Collection<?> collection) {
        super(new RangeIteratorAdapter(collection));
    }

    //---------------------------------------------------------< RowIterator >

    /**
     * Returns the next row.
     *
     * @return next row
     * @throws NoSuchElementException if there is no next row
     */
    public Row nextRow() {
        return (Row) next();
    }

}

@@ -1488,230 +1488,8 @@
 );%0A%0A
-    /**%0A     * Creates an adapter for the given %7B@link RangeIterator%7D.%0A     *%0A     * @param iterator iterator of %7B@link Row%7Ds%0A     */%0A    public RowIteratorAdapter(RangeIterator iterator) %7B%0A        super(iterator);%0A    %7D%0A%0A
     

Add a filtered RangeIterator