Fix more uses of generic method comments and increment the data version (TBR)

pkg/analyzer/lib/src/task/inputs.dart

 // Copyright (c) 2015, 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.
 
 library analyzer.src.task.inputs;
 
 import 'dart:collection';
 
 import 'package:analyzer/task/model.dart';
 
@@ skipping 71 matching lines @@
    */
   ListTaskInputImpl(AnalysisTarget target, ResultDescriptor<List<E>> result)
       : super._unflushable(target, result);
 }
 
 /**
  * A mixin-ready implementation of [ListTaskInput].
  */
 abstract class ListTaskInputMixin<E> implements ListTaskInput<E> {
   @override
-  ListTaskInput/*<V>*/ toFlattenListOf/*<V>*/(
-      ListResultDescriptor/*<V>*/ subListResult) {
-    return new ListToFlattenListTaskInput<E, dynamic/*=V*/ >(
+  ListTaskInput<V> toFlattenListOf<V>(ListResultDescriptor<V> subListResult) {
+    return new ListToFlattenListTaskInput<E, V>(
         this,
         (E element) =>
-            subListResult.of(element as AnalysisTarget) as TaskInput/*<V>*/);
+            subListResult.of(element as AnalysisTarget) as TaskInput<V>);
   }
 
-  ListTaskInput/*<V>*/ toList/*<V>*/(UnaryFunction<E, dynamic/*=V*/ > mapper) {
-    return new ListToListTaskInput<E, dynamic/*=V*/ >(this, mapper);
+  ListTaskInput<V> toList<V>(UnaryFunction<E, V> mapper) {
+    return new ListToListTaskInput<E, V>(this, mapper);
   }
 
-  ListTaskInput/*<V>*/ toListOf/*<V>*/(ResultDescriptor/*<V>*/ valueResult) {
+  ListTaskInput<V> toListOf<V>(ResultDescriptor<V> valueResult) {
     return (this as ListTaskInput<AnalysisTarget>).toList(valueResult.of);
   }
 
-  MapTaskInput<E, dynamic/*=V*/ > toMap/*<V>*/(
-      UnaryFunction<E, dynamic/*=V*/ > mapper) {
-    return new ListToMapTaskInput<E, dynamic/*=V*/ >(this, mapper);
+  MapTaskInput<E, V> toMap<V>(UnaryFunction<E, V> mapper) {
+    return new ListToMapTaskInput<E, V>(this, mapper);
   }
 
-  MapTaskInput<AnalysisTarget, dynamic/*=V*/ > toMapOf/*<V>*/(
-      ResultDescriptor/*<V>*/ valueResult) {
+  MapTaskInput<AnalysisTarget, V> toMapOf<V>(ResultDescriptor<V> valueResult) {
     return (this as ListTaskInputImpl<AnalysisTarget>).toMap(valueResult.of);
   }
 }
 
 /**
  * An input to an [AnalysisTask] that is computed by the following steps. First
  * another (base) task input is used to compute a [List]-valued result. An input
  * generator function is then used to map each element of that list to a task
  * input. Finally, each of the task inputs are used to access analysis results,
  * and the list of the analysis results is used as the input to the task.
@@ skipping 147 matching lines @@
   @override
   void _initResultValue() {
     _resultValue = new HashMap<B, E>();
   }
 }
 
 /**
  * A mixin-ready implementation of [MapTaskInput].
  */
 abstract class MapTaskInputMixin<K, V> implements MapTaskInput<K, V> {
-  TaskInput<List/*<E>*/ > toFlattenList/*<E>*/(
-      BinaryFunction<K, dynamic /*element of V*/, dynamic/*=E*/ > mapper) {
-    return new MapToFlattenListTaskInput<K, dynamic /*element of V*/,
-            dynamic/*=E*/ >(
+  TaskInput<List<E>> toFlattenList<E>(
+      BinaryFunction<K, dynamic /*element of V*/, E> mapper) {
+    return new MapToFlattenListTaskInput<K, dynamic /*element of V*/, E>(
         this as MapTaskInput<K, List /*element of V*/ >, mapper);
   }
 }
 
 /**
  * A [TaskInput] that is computed by the following steps.
  *
  * First the [base] task input is used to compute a [Map]-valued result.
  * The values of the [Map] must be [List]s.
  *
@@ skipping 70 matching lines @@
     currentBuilder.currentValueNotAvailable();
   }
 
   @override
   bool moveNext() {
     // Prepare base Map.
     if (baseMap == null) {
       if (currentBuilder.moveNext()) {
         return true;
       }
-      baseMap = currentBuilder.inputValue as dynamic/*=Map<K, List<V>>*/;
+      baseMap = currentBuilder.inputValue as Map<K, List<V>>;
       if (baseMap == null) {
         // No base map could be computed due to a circular dependency.  Use an
         // empty map so that no further results will be computed.
         baseMap = {};
       }
       keyIterator = baseMap.keys.iterator;
       // Done with this builder.
       currentBuilder = null;
     }
     // Prepare the next result value.
     if (currentBuilder != null) {
       if (currentBuilder.moveNext()) {
         return true;
       }
       // Add the result value for the current Map key/value.
-      E resultValue = currentBuilder.inputValue as dynamic/*=E*/;
+      E resultValue = currentBuilder.inputValue as E;
       if (resultValue != null) {
         inputValue.add(resultValue);
       }
       // Done with this builder.
       currentBuilder = null;
     }
     // Move to the next Map value.
     if (valueIterator != null && valueIterator.moveNext()) {
       K key = keyIterator.current;
       V value = valueIterator.current;
@@ skipping 34 matching lines @@
    * Initialize a newly created task input that computes the input by accessing
    * the given [baseInput] associated with the given [mapper].
    */
   ObjectToListTaskInput(this.baseInput, this.mapper);
 
   @override
   TaskInputBuilder<List<E>> createBuilder() =>
       new ObjectToListTaskInputBuilder<E>(this);
 
   @override
-  ListTaskInput/*<V>*/ toFlattenListOf/*<V>*/(
-      ListResultDescriptor/*<V>*/ subListResult) {
-    return new ListToFlattenListTaskInput<E, dynamic/*=V*/ >(
+  ListTaskInput<V> toFlattenListOf<V>(ListResultDescriptor<V> subListResult) {
+    return new ListToFlattenListTaskInput<E, V>(
         this,
         (E element) =>
-            subListResult.of(element as AnalysisTarget) as TaskInput/*<V>*/);
+            subListResult.of(element as AnalysisTarget) as TaskInput<V>);
   }
 
   @override
-  ListTaskInput/*<V>*/ toListOf/*<V>*/(ResultDescriptor/*<V>*/ valueResult) {
-    return new ListToListTaskInput<E, dynamic/*=V*/ >(
+  ListTaskInput<V> toListOf<V>(ResultDescriptor<V> valueResult) {
+    return new ListToListTaskInput<E, V>(
         this, (E element) => valueResult.of(element as AnalysisTarget));
   }
 
   @override
-  MapTaskInput<AnalysisTarget, dynamic/*=V*/ > toMapOf/*<V>*/(
-      ResultDescriptor/*<V>*/ valueResult) {
-    return new ListToMapTaskInput<AnalysisTarget, dynamic/*=V*/ >(
-        this as dynamic/*=TaskInput<List<AnalysisTarget>>*/, valueResult.of);
+  MapTaskInput<AnalysisTarget, V> toMapOf<V>(ResultDescriptor<V> valueResult) {
+    return new ListToMapTaskInput<AnalysisTarget, V>(
+        this as TaskInput<List<AnalysisTarget>>, valueResult.of);
   }
 }
 
 /**
  * A [TaskInputBuilder] used to build an input based on a [SimpleTaskInput].
  */
 class ObjectToListTaskInputBuilder<E> implements TaskInputBuilder<List<E>> {
   /**
    * The input being built.
    */
@@ skipping 217 matching lines @@
             'The value of the current result must be set before moving to the next result.');
       }
       _state = _AFTER;
       return false;
     }
   }
 }
 
 abstract class TaskInputImpl<V> implements TaskInput<V> {
   @override
-  ListTaskInput/*<E>*/ mappedToList/*<E>*/(List/*<E>*/ mapper(V value)) {
+  ListTaskInput<E> mappedToList<E>(List<E> mapper(V value)) {
     return new ObjectToListTaskInput(
         this, (Object element) => mapper(element as V));
   }
 }
 
 /**
  * A [TaskInputBuilder] used to build an input based on one or more other task
  * inputs. The task inputs to be built are specified by a table mapping the name
  * of the input to the task used to access the input's value.
  */
@@ skipping 252 matching lines @@
         // We have already computed all of the results, so just return false.
         return false;
       }
     }
     if (currentBuilder.moveNext()) {
       return true;
     }
     if (_resultValue == null) {
       // We have finished computing the list of values from which the results
       // will be derived.
-      _baseList = currentBuilder.inputValue as dynamic/*=List<B>*/;
+      _baseList = currentBuilder.inputValue as List<B>;
       if (_baseList == null) {
         // No base list could be computed due to a circular dependency.  Use an
         // empty list so that no further results will be computed.
         _baseList = [];
       }
       _baseListIndex = 0;
       _initResultValue();
     } else {
       // We have finished computing one of the elements in the result list.
       if (currentBuilder.inputValue != null) {
-        _addResultElement(
-            _baseListElement, currentBuilder.inputValue as dynamic/*=E*/);
+        _addResultElement(_baseListElement, currentBuilder.inputValue as E);
       }
       _baseListIndex++;
     }
     if (_baseListIndex >= _baseList.length) {
       currentBuilder = null;
       return false;
     }
     _baseListElement = _baseList[_baseListIndex];
     currentBuilder = input.generateTaskInputs(_baseListElement).createBuilder();
     return currentBuilder.moveNext();
   }
 
   void _addResultElement(B baseElement, E resultElement);
   void _initResultValue();
 }