Refactor CompilerOutput

tests/compiler/dart2js/sourcemaps/sourcemap_helper.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 sourcemap.helper;
 
 import 'dart:async';
 import 'dart:io';
 import 'package:compiler/compiler_new.dart';
 import 'package:compiler/src/apiimpl.dart' as api;
 import 'package:compiler/src/commandline_options.dart';
 import 'package:compiler/src/null_compiler_output.dart' show NullSink;
 import 'package:compiler/src/elements/elements.dart';
 import 'package:compiler/src/helpers/helpers.dart';
 import 'package:compiler/src/filenames.dart';
 import 'package:compiler/src/io/code_output.dart';
 import 'package:compiler/src/io/source_file.dart';
 import 'package:compiler/src/io/source_information.dart';
 import 'package:compiler/src/io/position_information.dart';
 import 'package:compiler/src/js/js.dart' as js;
 import 'package:compiler/src/js/js_debug.dart';
 import 'package:compiler/src/js/js_source_mapping.dart';
 import 'package:compiler/src/js_backend/js_backend.dart';
 import 'package:compiler/src/source_file_provider.dart';
 import '../memory_compiler.dart';
 import '../output_collector.dart';
 
-class SourceFileSink implements EventSink<String> {
+class SourceFileSink implements OutputSink {
   final String filename;
   StringBuffer sb = new StringBuffer();
   SourceFile sourceFile;
 
   SourceFileSink(this.filename);
 
   @override
   void add(String event) {
     sb.write(event);
   }
 
   @override
-  void addError(errorEvent, [StackTrace stackTrace]) {
-    // Ignore.
-  }
-
-  @override
   void close() {
     sourceFile = new StringSourceFile.fromName(filename, sb.toString());
   }
 }
 
 class OutputProvider implements CompilerOutput {
   Map<Uri, SourceFileSink> outputMap = <Uri, SourceFileSink>{};
 
   SourceFile getSourceFile(Uri uri) {
     SourceFileSink sink = outputMap[uri];
     if (sink != null) {
       return sink.sourceFile;
     }
     return null;
   }
 
-  SourceFileSink createSourceFileSink(String name, String extension) {
+  SourceFileSink createSourceFileSink(
+      String name, String extension, OutputType type) {
     String filename = '$name.$extension';
     SourceFileSink sink = new SourceFileSink(filename);
     Uri uri = Uri.parse(filename);
     outputMap[uri] = sink;
     return sink;
   }
 
   @override
-  EventSink<String> createEventSink(String name, String extension) {
-    return createSourceFileSink(name, extension);
+  OutputSink createOutputSink(String name, String extension, OutputType type) {
+    return createSourceFileSink(name, extension, type);
   }
 }
 
 class CloningOutputProvider extends OutputProvider {
   RandomAccessFileOutputProvider outputProvider;
 
   CloningOutputProvider(Uri jsUri, Uri jsMapUri)
       : outputProvider = new RandomAccessFileOutputProvider(jsUri, jsMapUri);
 
   @override
-  EventSink<String> createEventSink(String name, String extension) {
-    EventSink<String> output = outputProvider(name, extension);
-    return new CloningEventSink(
-        [output, createSourceFileSink(name, extension)]);
+  OutputSink createOutputSink(String name, String extension, OutputType type) {
+    OutputSink output = outputProvider.createOutputSink(name, extension, type);
+    return new CloningOutputSink(
+        [output, createSourceFileSink(name, extension, type)]);
   }
 }
 
 abstract class SourceFileManager {
   SourceFile getSourceFile(var uri);
 }
 
 class ProviderSourceFileManager implements SourceFileManager {
   final SourceFileProvider sourceFileProvider;
   final OutputProvider outputProvider;
@@ skipping 453 matching lines @@
       absoluteUri = base.resolveUri(uri);
     } else {
       absoluteUri = base.resolve(uri);
     }
     return sourceFiles.putIfAbsent(absoluteUri, () {
       String text = new File.fromUri(absoluteUri).readAsStringSync();
       return new StringSourceFile.fromUri(absoluteUri, text);
     });
   }
 }