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

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

 library java.core;
 
 import "dart:math" as math;
 import "dart:uri";
 
 class JavaSystem {
   static int currentTimeMillis() {
     return (new DateTime.now()).millisecondsSinceEpoch;
   }
 
@@ skipping 239 matching lines @@
 }
 
 class URISyntaxException implements Exception {
   String toString() => "URISyntaxException";
 }
 
 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 {
     return elements.iterator;
   }
 
   E operator [](int index) {
     return elements[index];
   }
 
   void operator []=(int index, E value) {
     elements[index] = value;
   }
 
   void set length(int newLength) {
     elements.length = newLength;
   }
 
   void add(E value) {
     elements.add(value);
   }
 
   void addLast(E value) {

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

Can be removed.

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

Done.

     elements.add(value);
   }
 
   void addAll(Iterable<E> iterable) {
     elements.addAll(iterable);
   }
 
   void sort([int compare(E a, E b)]) {
     elements.sort(compare);
   }
@@ skipping 43 matching lines @@
   void insertRange(int start, int length, [E fill]) {
     elements.insertRange(start, length, fill);
   }
 
   Map<int, E> asMap() {
     return elements.asMap();
   }
 }
 
 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);
     }
   }
 
   bool get hasNext {
     return _elPos < _elements.length;
   }
 
   E next() {
     _current = _elements[_elPos];
     _coPos++;
     _elPos++;
     return _current;
   }
 
   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}");
     }
   }
 }
 
 class MapEntry<K, V> {
   K _key;
   V _value;
   MapEntry(this._key, this._value);
   K getKey() => _key;
   V getValue() => _value;
@@ skipping 49 matching lines @@
       }
     } else if (sb.length > newLength) {
       var s = sb.toString().substring(0, newLength);
       sb = new StringBuffer(s);
     }
   }
   void clear() {
     sb = new StringBuffer();
   }
 }