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

sdk/lib/collection/queue.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dart.collection;
 
 /**
  * A [Queue] is a collection that can be manipulated at both ends. One
  * can iterate over the elements of a queue through [forEach] or with
  * an [Iterator].
  */
-abstract class Queue<E> implements Collection<E> {
+abstract class Queue<E> implements Iterable<E> {
 
   /**
    * Creates a queue.
    */
   factory Queue() => new ListQueue<E>();
 
   /**
    * Creates a queue with the elements of [other]. The order in
    * the queue will be the order provided by the iterator of [other].
    */
@@ skipping 130 matching lines @@
   }
 }
 
 /**
  * A [Queue] implementation based on a double-linked list.
  *
  * Allows constant time add, remove-at-ends and peek operations.
  *
  * Can do [removeAll] and [retainAll] in linear time.
  */
-class DoubleLinkedQueue<E> extends Collection<E> implements Queue<E> {
+class DoubleLinkedQueue<E> extends Iterable<E> implements Queue<E> {
   _DoubleLinkedQueueEntrySentinel<E> _sentinel;
   int _elementCount = 0;
 
   DoubleLinkedQueue() {
     _sentinel = new _DoubleLinkedQueueEntrySentinel<E>();
   }
 
   factory DoubleLinkedQueue.from(Iterable<E> other) {
     Queue<E> list = new DoubleLinkedQueue();
     for (final e in other) {
@@ skipping 129 matching lines @@
       f(entry);
       entry = nextEntry;
     }
   }
 
   _DoubleLinkedQueueIterator<E> get iterator {
     return new _DoubleLinkedQueueIterator<E>(_sentinel);
   }
 
   String toString() {
-    return Collections.collectionToString(this);
+    return ToString.iterableToString(this);
   }
 }
 
 class _DoubleLinkedQueueIterator<E> implements Iterator<E> {
   _DoubleLinkedQueueEntrySentinel<E> _sentinel;
   DoubleLinkedQueueEntry<E> _currentEntry = null;
   E _current;
 
   _DoubleLinkedQueueIterator(_DoubleLinkedQueueEntrySentinel<E> sentinel)
       : _sentinel = sentinel, _currentEntry = sentinel;
@@ skipping 20 matching lines @@
 
 /**
  * List based [Queue].
  *
  * Keeps a cyclic buffer of elements, and grows to a larger buffer when
  * it fills up. This guarantees constant time peek and remove operations, and
  * amortized constant time add operations.
  *
  * The structure is efficient for any queue or stack usage.
  *
- * Collection operations like [removeAll] and [removeWhere] are very
+ * Operations like [removeAll] and [removeWhere] are very
  * inefficient. If those are needed, use a [DoubleLinkedQueue] instead.
  */
-class ListQueue<E> extends Collection<E> implements Queue<E>{
+class ListQueue<E> extends Iterable<E> implements Queue<E>{
   static const int _INITIAL_CAPACITY = 8;
   List<E> _table;
   int _head;
   int _tail;
   int _modificationCount = 0;
 
   /**
    * Create an empty queue.
    *
    * If [initialCapacity] is given, prepare the queue for at least that many
@@ skipping 115 matching lines @@
     for (int i = _head; i != _tail; i = (i + 1) & (_table.length - 1)) {
       E element = _table[i];
       if (element == object) {
         _remove(i);
         return;
       }
     }
     _modificationCount++;
   }
 
-  void removeAll(Iterable objectsToRemove) {
-    IterableMixinWorkaround.removeAllList(this, objectsToRemove);
-  }
-
-  void retainAll(Iterable objectsToRetain) {
-    IterableMixinWorkaround.retainAll(this, objectsToRetain);
-  }
-
   void _filterWhere(bool test(E element), bool removeMatching) {
     int index = _head;
     int modificationCount = _modificationCount;
     int i = _head;
     while (i != _tail) {
       E element = _table[i];
       bool remove = (test(element) == removeMatching);
       _checkModification(modificationCount);
       if (remove) {
         i = _remove(i);
@@ skipping 28 matching lines @@
     if (_head != _tail) {
       for (int i = _head; i != _tail; i = (i + 1) & (_table.length - 1)) {
         _table[i] = null;
       }
       _head = _tail = 0;
       _modificationCount++;
     }
   }
 
   String toString() {
-    return Collections.collectionToString(this);
+    return ToString.iterableToString(this);
   }
 
   // Queue interface.
 
   void addLast(E element) { _add(element); }
 
   void addFirst(E element) {
     _head = (_head - 1) & (_table.length - 1);
     _table[_head] = element;
     if (_head == _tail) _grow();
@@ skipping 156 matching lines @@
     _queue._checkModification(_modificationCount);
     if (_position == _end) {
       _current = null;
       return false;
     }
     _current = _queue._table[_position];
     _position = (_position + 1) & (_queue._table.length - 1);
     return true;
   }
 }