From 35d4fd2ae778b4c3415b7ea63d2fa7c806ce0033 Mon Sep 17 00:00:00 2001
From: Thomas Neidhart <tn@apache.org>
Date: Wed, 20 Nov 2013 21:23:53 +0000
Subject: [PATCH] [COLLECTIONS-502] remove generic parameters from static
 INSTANCE fields.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1543955 13f79535-47bb-0310-9956-ffa450edef68
---
 .../commons/collections4/iterators/ArrayListIterator.java   | 1 -
 .../commons/collections4/iterators/EmptyIterator.java       | 6 ++++--
 .../commons/collections4/iterators/EmptyListIterator.java   | 6 ++++--
 .../commons/collections4/iterators/EmptyMapIterator.java    | 3 ++-
 .../collections4/iterators/EmptyOrderedIterator.java        | 3 ++-
 .../collections4/iterators/EmptyOrderedMapIterator.java     | 3 ++-
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
index b1e321838..56f33e461 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
@@ -47,7 +47,6 @@ public class ArrayListIterator<E> extends ArrayIterator<E>
      * or <code>previous()</code>. This is set to <code>-1</code> if neither method
      * has yet been invoked. <code>lastItemIndex</code> is used to to implement
      * the {@link #set} method.
-     *
      */
     private int lastItemIndex = -1;
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java
index 7540d127b..f2cea2d2d 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java
@@ -36,13 +36,15 @@ public class EmptyIterator<E> extends AbstractEmptyIterator<E> implements Resett
      * Singleton instance of the iterator.
      * @since 3.1
      */
-    public static final ResettableIterator<Object> RESETTABLE_INSTANCE = new EmptyIterator<Object>();
+    @SuppressWarnings("rawtypes")
+    public static final ResettableIterator RESETTABLE_INSTANCE = new EmptyIterator<Object>();
 
     /**
      * Singleton instance of the iterator.
      * @since 2.1.1 and 3.1
      */
-    public static final Iterator<Object> INSTANCE = RESETTABLE_INSTANCE;
+    @SuppressWarnings("rawtypes")
+    public static final Iterator INSTANCE = RESETTABLE_INSTANCE;
 
     /**
      * Get a typed resettable empty iterator instance.
diff --git a/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java
index 18d71040a..23c1e6d7b 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java
@@ -37,13 +37,15 @@ public class EmptyListIterator<E> extends AbstractEmptyIterator<E> implements
      * Singleton instance of the iterator.
      * @since 3.1
      */
-    public static final ResettableListIterator<Object> RESETTABLE_INSTANCE = new EmptyListIterator<Object>();
+    @SuppressWarnings("rawtypes")
+    public static final ResettableListIterator RESETTABLE_INSTANCE = new EmptyListIterator<Object>();
 
     /**
      * Singleton instance of the iterator.
      * @since 2.1.1 and 3.1
      */
-    public static final ListIterator<Object> INSTANCE = RESETTABLE_INSTANCE;
+    @SuppressWarnings("rawtypes")
+    public static final ListIterator INSTANCE = RESETTABLE_INSTANCE;
 
     /**
      * Get a typed instance of the iterator.
diff --git a/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java
index 8ea1aad4e..9d71ded8b 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java
@@ -32,7 +32,8 @@ public class EmptyMapIterator<K, V> extends AbstractEmptyMapIterator<K, V> imple
      * Singleton instance of the iterator.
      * @since 3.1
      */
-    public static final MapIterator<Object, Object> INSTANCE = new EmptyMapIterator<Object, Object>();
+    @SuppressWarnings("rawtypes")
+    public static final MapIterator INSTANCE = new EmptyMapIterator<Object, Object>();
 
     /**
      * Get a typed instance of the iterator.
diff --git a/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java
index 5d1fa96f2..fd4727432 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java
@@ -32,7 +32,8 @@ public class EmptyOrderedIterator<E> extends AbstractEmptyIterator<E>
      * Singleton instance of the iterator.
      * @since 3.1
      */
-    public static final OrderedIterator<Object> INSTANCE = new EmptyOrderedIterator<Object>();
+    @SuppressWarnings("rawtypes")
+    public static final OrderedIterator INSTANCE = new EmptyOrderedIterator<Object>();
 
     /**
      * Typed instance of the iterator.
diff --git a/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java
index 395a7edbf..e24d8b3d2 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java
@@ -32,7 +32,8 @@ public class EmptyOrderedMapIterator<K, V> extends AbstractEmptyMapIterator<K, V
      * Singleton instance of the iterator.
      * @since 3.1
      */
-    public static final OrderedMapIterator<Object, Object> INSTANCE = new EmptyOrderedMapIterator<Object, Object>();
+    @SuppressWarnings("rawtypes")
+    public static final OrderedMapIterator INSTANCE = new EmptyOrderedMapIterator<Object, Object>();
 
     /**
      * Get a typed instance of the iterator.