| 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 1cb990e53d40c4d51d3a2c1e62c2fb053fba2650..59bee41b8aef9ee780a257885d76fb999e405def 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
|
| @@ -658,6 +658,7 @@ public class MainEngine {
|
| private static CompilationUnit buildConstantLibrary() throws Exception {
|
| CompilationUnit unit = new CompilationUnit(null, null, null, null, null);
|
| unit.getDirectives().add(libraryDirective("engine", "constant"));
|
| + unit.getDirectives().add(importDirective("dart:collection", null));
|
| unit.getDirectives().add(importDirective("java_core.dart", null));
|
| unit.getDirectives().add(
|
| importDirective("java_engine.dart", null, importShowCombinator("ObjectUtilities")));
|
| @@ -767,6 +768,7 @@ public class MainEngine {
|
| private static CompilationUnit buildEngineLibrary() throws Exception {
|
| CompilationUnit unit = new CompilationUnit(null, null, null, null, null);
|
| unit.getDirectives().add(libraryDirective("engine"));
|
| + unit.getDirectives().add(importDirective("dart:collection", null));
|
| unit.getDirectives().add(importDirective("java_core.dart", null));
|
| unit.getDirectives().add(importDirective("java_engine.dart", null));
|
| unit.getDirectives().add(importDirective("utilities_collection.dart", null));
|
| @@ -814,11 +816,12 @@ public class MainEngine {
|
| private static CompilationUnit buildErrorLibrary() throws Exception {
|
| CompilationUnit unit = new CompilationUnit(null, null, null, null, null);
|
| unit.getDirectives().add(libraryDirective("engine", "error"));
|
| + unit.getDirectives().add(importDirective("dart:collection", null));
|
| unit.getDirectives().add(importDirective("java_core.dart", null));
|
| unit.getDirectives().add(importDirective("source.dart", null));
|
| unit.getDirectives().add(importDirective("scanner.dart", null, importShowCombinator("Token")));
|
| unit.getDirectives().add(importDirective("ast.dart", null, importShowCombinator("AstNode")));
|
| - unit.getDirectives().add(importDirective("element.dart", null, importShowCombinator("Element")));
|
| + unit.getDirectives().add(importDirective("element.dart", null));
|
| for (Entry<File, List<CompilationUnitMember>> entry : context.getFileToMembers().entrySet()) {
|
| File file = entry.getKey();
|
| if (isEnginePath(file, "error/") || isEnginePath(file, "internal/error/")) {
|
| @@ -1058,6 +1061,7 @@ public class MainEngine {
|
| private static CompilationUnit buildResolverTestLibrary() throws Exception {
|
| CompilationUnit unit = new CompilationUnit(null, null, null, null, null);
|
| unit.getDirectives().add(libraryDirective("engine", "resolver_test"));
|
| + unit.getDirectives().add(importDirective("dart:collection", null));
|
| unit.getDirectives().add(importDirective(src_package + "java_core.dart", null));
|
| unit.getDirectives().add(importDirective(src_package + "java_junit.dart", null));
|
| unit.getDirectives().add(importDirective(src_package + "java_engine.dart", null));
|
| @@ -1192,6 +1196,7 @@ public class MainEngine {
|
| private static CompilationUnit buildSdkLibrary() throws Exception {
|
| CompilationUnit unit = new CompilationUnit(null, null, null, null, null);
|
| unit.getDirectives().add(libraryDirective("engine", "sdk"));
|
| + unit.getDirectives().add(importDirective("dart:collection", null));
|
| unit.getDirectives().add(
|
| importDirective(
|
| "source.dart",
|
| @@ -1260,6 +1265,7 @@ public class MainEngine {
|
| private static CompilationUnit buildSourceLibrary() throws Exception {
|
| CompilationUnit unit = new CompilationUnit(null, null, null, null, null);
|
| unit.getDirectives().add(libraryDirective("engine", "source"));
|
| + unit.getDirectives().add(importDirective("dart:collection", null));
|
| unit.getDirectives().add(importDirective("java_core.dart", null));
|
| unit.getDirectives().add(importDirective("sdk.dart", null, importShowCombinator("DartSdk")));
|
| unit.getDirectives().add(
|
| @@ -1288,6 +1294,7 @@ public class MainEngine {
|
| private static CompilationUnit buildTestSupportLibrary() throws Exception {
|
| CompilationUnit unit = new CompilationUnit(null, null, null, null, null);
|
| unit.getDirectives().add(libraryDirective("engine", "test_support"));
|
| + unit.getDirectives().add(importDirective("dart:collection", null));
|
| unit.getDirectives().add(importDirective(src_package + "java_core.dart", null));
|
| unit.getDirectives().add(importDirective(src_package + "java_junit.dart", null));
|
| unit.getDirectives().add(importDirective(src_package + "java_engine.dart", null));
|
| @@ -1320,6 +1327,7 @@ public class MainEngine {
|
| private static CompilationUnit buildUtilitiesCollectionLibrary() throws Exception {
|
| CompilationUnit unit = new CompilationUnit(null, null, null, null, null);
|
| unit.getDirectives().add(libraryDirective("engine", "utilities", "collection"));
|
| + unit.getDirectives().add(importDirective("dart:collection", null));
|
| 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()) {
|
|
|