Remove Futures class, move methods to Future.

tools/html_json_doc/lib/html_to_json.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.
 
 /**
  * Library for extracting the documentation comments from files generated by
  * the HTML library. The comments are stored in a JSON file.
  *
  * Comments must be in either the block style with leading *s:
  *
@@ skipping 19 matching lines @@
 
 /// True if any errors were triggered through the conversion.
 bool _anyErrors = false;
 
 
 /**
  * Convert files on [htmlPath] and write JSON to [jsonPath].
  */
 Future<bool> convert(Path htmlPath, Path jsonPath) {
   var completer = new Completer();
-  
+
   // TODO(amouravski): make this transform once I know what I want this file to
   // return.
   _convertFiles(htmlPath).then((convertedJson) {
     final jsonFile = new File.fromPath(jsonPath);
     var writeJson = convertedJson;
 
     if (jsonFile.existsSync()) {
       writeJson = _mergeJsonAndFile(convertedJson, jsonFile);
     }
 
@@ skipping 47 matching lines @@
       _anyErrors = true;
       return;
     }
 
     fileFutures.add(_convertFile(file));
   };
 
 
   // Combine all JSON objects
   lister.onDone = (_) {
-    Futures.wait(fileFutures).then((jsonList) {
+    Future.wait(fileFutures).then((jsonList) {
       var convertedJson = {};
       jsonList.forEach((json) {
         final k = json.keys[0];
         convertedJson.putIfAbsent(k, () => json[k]);
       });
       completer.complete(convertedJson);
     });
   };
 
   // TODO(amouravski): add more error handling.
@@ skipping 144 matching lines @@
 bool _listsEqual(List list1, List list2) {
   return list1.every((e) => list2.contains(e)) &&
       list2.every((e) => list1.contains(e));
 }
 
 
 /**
  * Print JSON in a much nicer format.
  *
  * For example:
- * 
+ *
  *     {"foo":["bar","baz"],"boo":{"far:"faz"}}
  *
  * becomes:
  *
  *     {
  *       "foo":
  *         [
  *           "bar",
  *           "baz"
  *         ],
  *       "boo":
  *         {
  *           "far":
  *             "faz"
  *         }
  *     }
  */
 String prettyPrintJson(Object json, [String indentation = '']) {
   var output;
 
   if (json is List) {
     var recursiveOutput =
-        Strings.join(json.map((e) => 
+        Strings.join(json.map((e) =>
             prettyPrintJson(e, '$indentation  ')), ',\n');
     output = '$indentation[\n'
       '$recursiveOutput'
       '\n$indentation]';
   } else if (json is Map) {
     var keys = json.keys
       ..sort();
 
     // TODO(amouravski): No newline after :
     var mapList = keys.map((key) =>
         '$indentation${JSON.stringify(key)}:\n'
         '${prettyPrintJson(json[key], '$indentation  ')}');
     var recursiveOutput = Strings.join(mapList, ',\n');
     output = '$indentation{\n'
       '$recursiveOutput'
       '\n$indentation}';
   } else {
     output = '$indentation${JSON.stringify(json)}';
   }
   return output;
 }