[cp-patches] [generics] Patch: FYI: two minor generics fixes

[Tom Tromey]

I'm checking this in on the generics branch.

This fixes a couple of minor bugs found by gcjx, introduced earlier
by me.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>

        * java/util/AbstractSet.java (removeAll): Fixed iterator
        declaration.
        * java/util/AbstractList.java (RandomAccessSubList): RandomAccess
        is not generic.

Index: java/util/AbstractList.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/AbstractList.java,v
retrieving revision 1.21.2.1
diff -u -r1.21.2.1 AbstractList.java
--- java/util/AbstractList.java 5 Aug 2004 21:09:36 -0000 1.21.2.1
+++ java/util/AbstractList.java 3 Nov 2004 18:32:07 -0000
@@ -921,7 +921,7 @@
  * @author Eric Blake <address@hidden>
  */
 final class RandomAccessSubList<E> extends SubList<E>
-  implements RandomAccess<E>
+  implements RandomAccess
 {
   /**
    * Construct the sublist.
Index: java/util/AbstractSet.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/AbstractSet.java,v
retrieving revision 1.14.2.2
diff -u -r1.14.2.2 AbstractSet.java
--- java/util/AbstractSet.java 15 Aug 2004 07:59:51 -0000 1.14.2.2
+++ java/util/AbstractSet.java 3 Nov 2004 18:32:07 -0000
@@ -127,7 +127,8 @@
     int count = c.size();
     if (oldsize < count)
       {
-       for (Iterator<E> i = iterator(), count = oldsize; count > 0; count--)
+       Iterator<E> i;
+       for (i = iterator(), count = oldsize; count > 0; count--)
          {
            if (c.contains(i.next()))
              i.remove();
@@ -135,7 +136,8 @@
       }
     else
       {
-       for (Iterator<?> i = c.iterator(); count > 0; count--)
+       Iterator<?> i;
+       for (i = c.iterator(); count > 0; count--)
          remove(i.next());
       }
     return oldsize != size();