New analyzer_experimental snapshot.

editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java

Index: editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java
diff --git a/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java b/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java
index a11d681e61418f2fccbe4814c48fa2360cfb1183..596a3400de096e2dba4ddd1afd792beb7b3e63e3 100644
--- a/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java
+++ b/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java
@@ -162,6 +162,9 @@ public class MainEngine {
     context.addSourceFile(new File(
         engineFolder,
         "com/google/dart/engine/utilities/collection/ListUtilities.java"));
+    context.addSourceFile(new File(
+        engineFolder,
+        "com/google/dart/engine/utilities/collection/TokenMap.java"));
     // Tests
     context.addSourceFile(new File(
         engineTestFolder,
@@ -445,6 +448,8 @@ public class MainEngine {
     unit.getDirectives().add(
         importDirective("engine.dart", null, importShowCombinator("AnalysisEngine")));
     unit.getDirectives().add(importDirective("utilities_dart.dart", null));
+    unit.getDirectives().add(
+        importDirective("utilities_collection.dart", null, importShowCombinator("TokenMap")));
     unit.getDirectives().add(importDirective("element.dart", null));
     for (CompilationUnitMember member : dartUnit.getDeclarations()) {
       File file = context.getMemberToFile().get(member);
@@ -611,7 +616,7 @@ public class MainEngine {
         importDirective(
             "scanner.dart",
             null,
-            importShowCombinator("Token", "CharBufferScanner", "StringScanner")));
+            importShowCombinator("Token", "Scanner", "CharSequenceReader")));
     unit.getDirectives().add(importDirective("ast.dart", null));
     unit.getDirectives().add(importDirective("parser.dart", null, importShowCombinator("Parser")));
     unit.getDirectives().add(importDirective("sdk.dart", null, importShowCombinator("DartSdk")));
@@ -1030,6 +1035,7 @@ public class MainEngine {
     CompilationUnit unit = new CompilationUnit(null, null, null, null, null);
     unit.getDirectives().add(libraryDirective("engine", "utilities", "collection"));
     unit.getDirectives().add(importDirective("java_core.dart", null));
+    unit.getDirectives().add(importDirective("scanner.dart", null, importShowCombinator("Token")));
     for (Entry<File, List<CompilationUnitMember>> entry : context.getFileToMembers().entrySet()) {
       File file = entry.getKey();
       if (isEnginePath(file, "utilities/collection/")) {