Split MessageKind into a MessageKind key and a MessageTemplate.

tests/compiler/dart2js/analyze_only_test.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.
 
 // Smoke test of the dart2js compiler API.
 library analyze_only;
 
 import "package:expect/expect.dart";
 import 'dart:async';
 import "package:async_helper/async_helper.dart";
 
 import '../../utils/dummy_compiler_test.dart' as dummy;
 import 'package:compiler/compiler.dart';
 
-import 'package:compiler/src/dart2jslib.dart' show
-    MessageKind;
+import 'package:compiler/src/warnings.dart' show
+    MessageKind, MessageTemplate;
 
 import 'output_collector.dart';
 
 runCompiler(String main, List<String> options,
             onValue(String code, List errors, List warnings)) {
   List errors = new List();
   List warnings = new List();
 
   Future<String> localProvider(Uri uri) {
     if (uri.scheme != 'main') return dummy.provider(uri);
@@ skipping 34 matching lines @@
   });
 }
 
 main() {
   runCompiler(
     "",
     ['--generate-code-with-compile-time-errors'],
     (String code, List errors, List warnings) {
       Expect.isNotNull(code);
       Expect.isTrue(errors.isEmpty, 'errors is not empty: $errors');
+      MessageTemplate template =
+          MessageTemplate.TEMPLATES[MessageKind.MISSING_MAIN];
       Expect.equals(
-          "${MessageKind.MISSING_MAIN.message({'main': 'main'})}",
+          "${template.message({'main': 'main'})}",
           warnings.single);
     });
 
   runCompiler(
     "main() {}",
     ['--generate-code-with-compile-time-errors'],
     (String code, List errors, List warnings) {
       Expect.isNotNull(code);
       Expect.isTrue(errors.isEmpty);
       Expect.isTrue(warnings.isEmpty);
     });
 
   runCompiler(
     "",
     ['--analyze-only'],
     (String code, List errors, List warnings) {
       Expect.isNull(code);
       Expect.isTrue(errors.isEmpty, 'errors is not empty: $errors');
+      MessageTemplate template =
+          MessageTemplate.TEMPLATES[MessageKind.CONSIDER_ANALYZE_ALL];
       Expect.equals(
-          "${MessageKind.CONSIDER_ANALYZE_ALL.message({'main': 'main'})}",
+          "${template.message({'main': 'main'})}",
           warnings.single);
     });
 
   runCompiler(
     "main() {}",
     ['--analyze-only'],
     (String code, List errors, List warnings) {
       Expect.isNull(code);
       Expect.isTrue(errors.isEmpty);
       Expect.isTrue(warnings.isEmpty);
     });
 
   runCompiler(
     "Foo foo; // Unresolved but not analyzed.",
     ['--analyze-only'],
     (String code, List errors, List warnings) {
       Expect.isNull(code);
       Expect.isTrue(errors.isEmpty, 'errors is not empty: $errors');
+      MessageTemplate template =
+          MessageTemplate.TEMPLATES[MessageKind.CONSIDER_ANALYZE_ALL];
       Expect.equals(
-          "${MessageKind.CONSIDER_ANALYZE_ALL.message({'main': 'main'})}",
+          "${template.message({'main': 'main'})}",
           warnings.single);
     });
 
   runCompiler(
     """main() {
          Foo foo; // Unresolved and analyzed.
        }""",
     ['--analyze-only'],
     (String code, List errors, List warnings) {
       Expect.isNull(code);
@@ skipping 48 matching lines @@
   // --analyze-signatures-only implies --analyze-only
   runCompiler(
     "",
     ['--analyze-signatures-only', '--analyze-all'],
     (String code, List errors, List warnings) {
       Expect.isNull(code);
       Expect.isTrue(errors.isEmpty);
       Expect.isTrue(warnings.isEmpty);
     });
 }