editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java - Issue 16019002: Merge the dart:uri library into dart:core and update the Uri class

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

Issue 16019002: Merge the dart:uri library into dart:core and update the Uri class (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Add missing files Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « editor/util/plugins/com.google.dart.java2dart/resources/java_io.dart ('k') | pkg/analyzer_experimental/lib/src/generated/engine.dart » ('j') | pkg/http/lib/src/multipart_request.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 61ec79373ed82278650a05a023c0b9ed7bcfec4e..f5a153d4c8a6a7cdeb7e644491b0a6d9c01f1e46 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

@@ -557,7 +557,6 @@ public class MainEngine {

unit.getDirectives().add(libraryDirective("engine"));

unit.getDirectives().add(

importDirective("dart:collection", null, importShowCombinator("HasNextIterator")));

- unit.getDirectives().add(importDirective("dart:uri", null, importShowCombinator("Uri")));

unit.getDirectives().add(importDirective("java_core.dart", null));

unit.getDirectives().add(importDirective("java_engine.dart", null));

unit.getDirectives().add(importDirective("instrumentation.dart", null));

@@ -707,7 +706,6 @@ public class MainEngine {

CompilationUnit unit = new CompilationUnit(null, null, null, null, null);

unit.getDirectives().add(libraryDirective("engine", "resolver"));

unit.getDirectives().add(importDirective("dart:collection", null));

- unit.getDirectives().add(importDirective("dart:uri", null, importShowCombinator("Uri")));

unit.getDirectives().add(importDirective("java_core.dart", null));

unit.getDirectives().add(importDirective("java_engine.dart", null));

unit.getDirectives().add(importDirective("instrumentation.dart", null));

@@ -871,7 +869,6 @@ public class MainEngine {

CompilationUnit unit = new CompilationUnit(null, null, null, null, null);

unit.getDirectives().add(libraryDirective("engine", "sdk"));

unit.getDirectives().add(importDirective("dart:io", null));

- 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("java_engine.dart", null));

@@ -902,7 +899,6 @@ 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:uri", null));

unit.getDirectives().add(importDirective("java_core.dart", null));

unit.getDirectives().add(importDirective("java_engine.dart", null));

unit.getDirectives().add(

@@ -928,7 +924,6 @@ public class MainEngine {

unit.getDirectives().add(libraryDirective("engine", "source", "io"));

unit.getDirectives().add(importDirective("source.dart", null));

unit.getDirectives().add(importDirective("dart:io", null));

- 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")));

@@ -961,7 +956,6 @@ 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:uri", null));

unit.getDirectives().add(importDirective("java_core.dart", null));

unit.getDirectives().add(importDirective("sdk.dart", null, importShowCombinator("DartSdk")));

unit.getDirectives().add(

@@ -987,7 +981,6 @@ public class MainEngine {

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("dart:uri", null));

unit.getDirectives().add(importDirective(src_package + "java_core.dart", null));

unit.getDirectives().add(importDirective(src_package + "java_engine.dart", null));

unit.getDirectives().add(importDirective(src_package + "java_junit.dart", null));