Remove Collection, Collections and clean up List/Set/Queue implementations of retain/remove.

editor/util/plugins/com.google.dart.java2dart/resources/java_core.dart

Index: editor/util/plugins/com.google.dart.java2dart/resources/java_core.dart
diff --git a/editor/util/plugins/com.google.dart.java2dart/resources/java_core.dart b/editor/util/plugins/com.google.dart.java2dart/resources/java_core.dart
index 900c2ca7093040a5dcb0a186381e0bfcbefaf939..6b8453f5c22c6cb968c7336dc42460775a69ad7a 100644
--- a/editor/util/plugins/com.google.dart.java2dart/resources/java_core.dart
+++ b/editor/util/plugins/com.google.dart.java2dart/resources/java_core.dart
@@ -257,7 +257,7 @@ class IOException implements Exception {
   String toString() => "IOException";
 }
 
-class ListWrapper<E> extends Collection<E> implements List<E> {
+class ListWrapper<E> extends Iterable<E> implements List<E> {

[floitsch, 2013/04/11 15:17:50]

I'm guessing that the ListWrapper extends Collection to get its functionality.
I would replace it with ListBase<E>.

[Anders Johnsen, 2013/04/12 09:31:14]

Done.

   List<E> elements = new List<E>();
 
   Iterator<E> get iterator {
@@ -344,13 +344,13 @@ class ListWrapper<E> extends Collection<E> implements List<E> {
 }
 
 class JavaIterator<E> {
-  Collection<E> _collection;
+  Iterable<E> _iterable;
   List<E> _elements = new List<E>();
   int _coPos = 0;
   int _elPos = 0;
   E _current = null;
-  JavaIterator(this._collection) {
-    Iterator iterator = _collection.iterator;
+  JavaIterator(this._iterable) {
+    Iterator iterator = _iterable.iterator;
     while (iterator.moveNext()) {
       _elements.add(iterator.current);
     }
@@ -368,13 +368,13 @@ class JavaIterator<E> {
   }
 
   void remove() {
-    if (_collection is List) {
+    if (_iterable is List) {
       _coPos--;
-      (_collection as List).remove(_coPos);
-    } else if (_collection is Set) {
-      _collection.remove(_current);
+      (_iterable as List).remove(_coPos);
+    } else if (_iterable is Set) {
+      _iterable.remove(_current);
     } else {
-      throw new StateError("Unsupported collection ${_collection.runtimeType}");
+      throw new StateError("Unsupported iterable ${_iterable.runtimeType}");
     }
   }
 }