Revert "Rename mappedBy to map."

runtime/lib/array.dart

 // Copyright (c) 2012, 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.
 
 
 // TODO(srdjan): Use shared array implementation.
 class _ObjectArray<E> implements List<E> {
 
   factory _ObjectArray(int length) native "ObjectArray_allocate";
 
@@ skipping 16 matching lines @@
   E removeAt(int index) {
     throw new UnsupportedError(
         "Cannot remove element of a non-extendable array");
   }
 
   void remove(Object element) {
     throw new UnsupportedError(
         "Cannot remove element of a non-extendable array");
   }
 
-  // Collection interface.
   void removeAll(Iterable elements) {
     throw new UnsupportedError(
         "Cannot remove element of a non-extendable array");
   }
 
   void retainAll(Iterable elements) {
     throw new UnsupportedError(
         "Cannot remove element of a non-extendable array");
   }
 
   void removeMatching(bool test(E element)) {
     throw new UnsupportedError(
         "Cannot remove element of a non-extendable array");
   }
 
   void retainMatching(bool test(E element)) {
     throw new UnsupportedError(
         "Cannot remove element of a non-extendable array");
   }
 
-  // List interface.
   void setRange(int start, int length, List<E> from, [int startFrom = 0]) {
     if (length < 0) {
       throw new ArgumentError("negative length $length");
     }
     if (from is _ObjectArray) {
       _copyFromObjectArray(from, startFrom, start, length);
     } else {
       Arrays.copy(from, startFrom, this, start, length);
     }
   }
@@ skipping 10 matching lines @@
 
   List<E> getRange(int start, int length) {
     if (length == 0) return [];
     Arrays.rangeCheck(this, start, length);
     List list = new _GrowableObjectArray<E>.withCapacity(length);
     list.length = length;
     Arrays.copy(this, start, list, 0, length);
     return list;
   }
 
-  // Iterable interface.
+  // Collection interface.
 
   bool contains(E element) {
     return IterableMixinWorkaround.contains(this, element);
   }
 
   void forEach(f(E element)) {
     IterableMixinWorkaround.forEach(this, f);
   }
 
   String join([String separator]) {
     return IterableMixinWorkaround.joinList(this, separator);
   }
 
-  Iterable map(f(E element)) {
-    return IterableMixinWorkaround.map(this, f);
-  }
-
   List mappedBy(f(E element)) {
-    IterableMixinWorkaround.mappedByList(this, f);
+    return IterableMixinWorkaround.mappedByList(this, f);
   }
 
   reduce(initialValue, combine(previousValue, E element)) {
     return IterableMixinWorkaround.reduce(this, initialValue, combine);
   }
 
   Iterable<E> where(bool f(E element)) {
     return IterableMixinWorkaround.where(this, f);
   }
 
-  Iterable<E> take(int n) {
+  List<E> take(int n) {
     return IterableMixinWorkaround.takeList(this, n);
   }
 
   Iterable<E> takeWhile(bool test(E value)) {
     return IterableMixinWorkaround.takeWhile(this, test);
   }
 
-  Iterable<E> skip(int n) {
+  List<E> skip(int n) {
     return IterableMixinWorkaround.skipList(this, n);
   }
 
   Iterable<E> skipWhile(bool test(E value)) {
     return IterableMixinWorkaround.skipWhile(this, test);
   }
 
   bool every(bool f(E element)) {
     return IterableMixinWorkaround.every(this, f);
   }
@@ skipping 185 matching lines @@
   // Collection interface.
 
   bool contains(E element) {
     return IterableMixinWorkaround.contains(this, element);
   }
 
   void forEach(f(E element)) {
     IterableMixinWorkaround.forEach(this, f);
   }
 
-  Iterable map(f(E element)) {
-    return IterableMixinWorkaround.map(this, f);
-  }
-
   List mappedBy(f(E element)) {
     return IterableMixinWorkaround.mappedByList(this, f);
   }
 
   String join([String separator]) {
     return IterableMixinWorkaround.joinList(this, separator);
   }
 
   reduce(initialValue, combine(previousValue, E element)) {
     return IterableMixinWorkaround.reduce(this, initialValue, combine);
   }
 
   Iterable<E> where(bool f(E element)) {
     return IterableMixinWorkaround.where(this, f);
   }
 
-  Iterable<E> take(int n) {
+  List<E> take(int n) {
     return IterableMixinWorkaround.takeList(this, n);
   }
 
   Iterable<E> takeWhile(bool test(E value)) {
     return IterableMixinWorkaround.takeWhile(this, test);
   }
 
-  Iterable<E> skip(int n) {
+  List<E> skip(int n) {
     return IterableMixinWorkaround.skipList(this, n);
   }
 
   Iterable<E> skipWhile(bool test(E value)) {
     return IterableMixinWorkaround.skipWhile(this, test);
   }
 
   bool every(bool f(E element)) {
     return IterableMixinWorkaround.every(this, f);
   }
@@ skipping 126 matching lines @@
     }
     _position = _length;
     _current = null;
     return false;
   }
 
   E get current {
     return _current;
   }
 }