| Index: tools/dom/templates/html/impl/impl_Node.darttemplate
|
| diff --git a/tools/dom/templates/html/impl/impl_Node.darttemplate b/tools/dom/templates/html/impl/impl_Node.darttemplate
|
| index b96554051c0a7456ef2a49aa495e44873e46e96d..d82ed6f84bcfa0cbc748eceaa008e35e6a97db79 100644
|
| --- a/tools/dom/templates/html/impl/impl_Node.darttemplate
|
| +++ b/tools/dom/templates/html/impl/impl_Node.darttemplate
|
| @@ -52,11 +52,11 @@ $else
|
| $endif
|
|
|
| Node min([int compare(Node a, Node b)]) {
|
| - return IterableMixinWorkaround.min(this, compare);
|
| + return Collections.min(this, compare);
|
| }
|
|
|
| Node max([int compare(Node a, Node b)]) {
|
| - return IterableMixinWorkaround.max(this, compare);
|
| + return Collections.max(this, compare);
|
| }
|
|
|
| void add(Node value) {
|
| @@ -102,30 +102,28 @@ $endif
|
|
|
| // TODO(jacobr): We can implement these methods much more efficiently by
|
| // looking up the nodeList only once instead of once per iteration.
|
| - bool contains(Node element) => IterableMixinWorkaround.contains(this, element);
|
| + bool contains(Node element) => Collections.contains(this, element);
|
|
|
| - void forEach(void f(Node element)) => IterableMixinWorkaround.forEach(this, f);
|
| + void forEach(void f(Node element)) => Collections.forEach(this, f);
|
|
|
| dynamic reduce(dynamic initialValue,
|
| dynamic combine(dynamic previousValue, Node element)) {
|
| - return IterableMixinWorkaround.reduce(this, initialValue, combine);
|
| + return Collections.reduce(this, initialValue, combine);
|
| }
|
|
|
| String join([String separator]) {
|
| - return IterableMixinWorkaround.joinList(this, separator);
|
| + return Collections.joinList(this, separator);
|
| }
|
|
|
| - List mappedBy(f(Node element)) {
|
| - return IterableMixinWorkaround.mappedByList(this, f);
|
| - }
|
| + List mappedBy(f(Node element)) =>
|
| + new MappedList<Node, dynamic>(this, f);
|
|
|
| - Iterable<Node> where(bool f(Node element)) {
|
| - return IterableMixinWorkaround.where(this, f);
|
| - }
|
| + Iterable<Node> where(bool f(Node element)) =>
|
| + new WhereIterable<Node>(this, f);
|
|
|
| - bool every(bool f(Node element)) => IterableMixinWorkaround.every(this, f);
|
| + bool every(bool f(Node element)) => Collections.every(this, f);
|
|
|
| - bool any(bool f(Node element)) => IterableMixinWorkaround.any(this, f);
|
| + bool any(bool f(Node element)) => Collections.any(this, f);
|
|
|
| List<Node> toList() => new List<Node>.from(this);
|
| Set<Node> toSet() => new Set<Node>.from(this);
|
| @@ -135,31 +133,31 @@ $endif
|
| // From List<Node>:
|
|
|
| List<Node> take(int n) {
|
| - return IterableMixinWorkaround.takeList(this, n);
|
| + return new ListView<Node>(this, 0, n);
|
| }
|
|
|
| Iterable<Node> takeWhile(bool test(Node value)) {
|
| - return IterableMixinWorkaround.takeWhile(this, test);
|
| + return new TakeWhileIterable<Node>(this, test);
|
| }
|
|
|
| List<Node> skip(int n) {
|
| - return IterableMixinWorkaround.skipList(this, n);
|
| + return new ListView<Node>(this, n, null);
|
| }
|
|
|
| Iterable<Node> skipWhile(bool test(Node value)) {
|
| - return IterableMixinWorkaround.skipWhile(this, test);
|
| + return new SkipWhileIterable<Node>(this, test);
|
| }
|
|
|
| Node firstMatching(bool test(Node value), {Node orElse()}) {
|
| - return IterableMixinWorkaround.firstMatching(this, test, orElse);
|
| + return Collections.firstMatching(this, test, orElse);
|
| }
|
|
|
| Node lastMatching(bool test(Node value), {Node orElse()}) {
|
| - return IterableMixinWorkaround.lastMatchingInList(this, test, orElse);
|
| + return Collections.lastMatchingInList(this, test, orElse);
|
| }
|
|
|
| Node singleMatching(bool test(Node value)) {
|
| - return IterableMixinWorkaround.singleMatching(this, test);
|
| + return Collections.singleMatching(this, test);
|
| }
|
|
|
| Node elementAt(int index) {
|
|
|