| 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 7fc0d3ed187961be144f13b2b74789e20423a7cd..16315075d769cef5af3388d5b531dacd3b96a31d 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
|
| @@ -850,8 +850,9 @@ public class MainEngine {
|
| unit.getDirectives().add(importDirective("dart:uri", null));
|
| unit.getDirectives().add(importDirective("java_core.dart", null));
|
| unit.getDirectives().add(importDirective("java_io.dart", null));
|
| + unit.getDirectives().add(importDirective("sdk.dart", null, importShowCombinator("DartSdk")));
|
| unit.getDirectives().add(
|
| - importDirective(src_package + "sdk.dart", null, importShowCombinator("DartSdk")));
|
| + importDirective("engine.dart", null, importShowCombinator("AnalysisContext")));
|
| unit.getDirectives().add(exportDirective("source.dart"));
|
| for (Entry<File, List<CompilationUnitMember>> entry : context.getFileToMembers().entrySet()) {
|
| File file = entry.getKey();
|
| @@ -876,6 +877,8 @@ public class MainEngine {
|
| unit.getDirectives().add(libraryDirective("engine", "source"));
|
| unit.getDirectives().add(importDirective("dart:uri", null));
|
| unit.getDirectives().add(importDirective("java_core.dart", null));
|
| + unit.getDirectives().add(
|
| + importDirective("engine.dart", null, importShowCombinator("AnalysisContext")));
|
| for (Entry<File, List<CompilationUnitMember>> entry : context.getFileToMembers().entrySet()) {
|
| File file = entry.getKey();
|
| if (isEnginePath(file, "source/Source.java")
|
| @@ -907,6 +910,8 @@ public class MainEngine {
|
| src_package + "element.dart",
|
| null,
|
| importShowCombinator("InterfaceType", "MethodElement", "PropertyAccessorElement")));
|
| + unit.getDirectives().add(
|
| + importDirective(src_package + "engine.dart", null, importShowCombinator("AnalysisContext")));
|
| unit.getDirectives().add(importDirective("package:unittest/unittest.dart", "_ut"));
|
| List<Statement> mainStatements = Lists.newArrayList();
|
| for (Entry<File, List<CompilationUnitMember>> entry : context.getFileToMembers().entrySet()) {
|
|
|