Merging from -r468106:814127 of collections_jdk5_branch - namely where this code was introduced in r738956.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@815002 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/commons/collections/iterators/AbstractEmptyMapIterator.java

@@ -0,0 +1,50 @@
+/*
+ * 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.commons.collections.iterators;
+
+/** 
+ * Provides an implementation of an empty map iterator.
+ *
+ * @since Commons Collections 5
+ * @version $Revision$ $Date$
+ *
+ * @author Stephen Colebourne
+ * @author Matt Benson
+ */
+public abstract class AbstractEmptyMapIterator<K, V> extends AbstractEmptyIterator<K> {
+
+    /**
+     * Create a new AbstractEmptyMapIterator.
+     */
+    public AbstractEmptyMapIterator() {
+        super();
+    }
+
+    public K getKey() {
+        throw new IllegalStateException("Iterator contains no elements");
+    }
+
+    public V getValue() {
+        throw new IllegalStateException("Iterator contains no elements");
+    }
+
+    public V setValue(V value) {
+        throw new IllegalStateException("Iterator contains no elements");
+    }
+
+
+}

src/java/org/apache/commons/collections/iterators/AbstractUntypedIteratorDecorator.java

@@ -0,0 +1,54 @@
+/**
+ *
+ */
+package org.apache.commons.collections.iterators;
+
+import java.util.Iterator;
+
+/**
+ * Provides basic behaviour for decorating an iterator with extra functionality
+ * without committing the generic type of the Iterator implementation.
+ * <p>
+ * All methods are forwarded to the decorated iterator.
+ *
+ * @since Commons Collections 5
+ * @version $Revision$ $Date$
+ *
+ * @author James Strachan
+ * @author Stephen Colebourne
+ * @author Matt Benson
+ */
+public abstract class AbstractUntypedIteratorDecorator<I, O> implements Iterator<O> {
+
+    /** The iterator being decorated */
+    protected final Iterator<I> iterator;
+
+    /**
+     * Create a new AbstractUntypedIteratorDecorator.
+     */
+    protected AbstractUntypedIteratorDecorator(Iterator<I> iterator) {
+        super();
+        if (iterator == null) {
+            throw new IllegalArgumentException("Iterator must not be null");
+        }
+        this.iterator = iterator;
+    }
+
+    /**
+     * Gets the iterator being decorated.
+     * 
+     * @return the decorated iterator
+     */
+    protected Iterator<I> getIterator() {
+        return iterator;
+    }
+
+    public boolean hasNext() {
+        return iterator.hasNext();
+    }
+
+    public void remove() {
+        iterator.remove();
+    }
+
+}