Merge the dart:uri library into dart:core and update the Uri class

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

 /*
  * Copyright (c) 2013, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 539 matching lines @@
     }
     EngineSemanticProcessor.addMain(unit, mainStatements);
     return unit;
   }
 
   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, 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));
     unit.getDirectives().add(importDirective("error.dart", null));
     unit.getDirectives().add(importDirective("source.dart", null));
     unit.getDirectives().add(
         importDirective(
             "scanner.dart",
             null,
             importShowCombinator("Token", "CharBufferScanner", "StringScanner")));
@@ skipping 129 matching lines @@
       }
     }
     EngineSemanticProcessor.addMain(unit, mainStatements);
     return unit;
   }
 
   private static CompilationUnit buildResolverLibrary() throws Exception {
     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));
     unit.getDirectives().add(importDirective("source.dart", null));
     unit.getDirectives().add(importDirective("error.dart", null));
     unit.getDirectives().add(importDirective("scanner.dart", "sc"));
     unit.getDirectives().add(importDirective("utilities_dart.dart", null));
     unit.getDirectives().add(importDirective("ast.dart", null));
     unit.getDirectives().add(
         importDirective("parser.dart", null, importShowCombinator("Parser", "ParserErrorCode")));
@@ skipping 143 matching lines @@
       }
     }
     EngineSemanticProcessor.addMain(unit, mainStatements);
     return unit;
   }
 
   private static CompilationUnit buildSdkIoLibrary() throws Exception {
     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));
     unit.getDirectives().add(importDirective("java_engine_io.dart", null));
     unit.getDirectives().add(importDirective("source_io.dart", null));
     unit.getDirectives().add(importDirective("error.dart", null));
     unit.getDirectives().add(importDirective("scanner.dart", null));
     unit.getDirectives().add(importDirective("ast.dart", null));
     unit.getDirectives().add(importDirective("parser.dart", null));
     unit.getDirectives().add(importDirective("sdk.dart", null));
@@ skipping 10 matching lines @@
       if (isEnginePath(file, "sdk/") || isEnginePath(file, "internal/sdk/")) {
         addNotRemovedCompiationUnitEntries(unit, entry.getValue());
       }
     }
     return unit;
   }
 
   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(
         importDirective(
             "source.dart",
             null,
             importShowCombinator("ContentCache", "Source", "UriKind")));
     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, "sdk/DartSdk") || isEnginePath(file, "sdk/SdkLibrary")
           || isEnginePath(file, "internal/sdk/SdkLibraryImpl")
           || isEnginePath(file, "internal/sdk/LibraryMap")) {
         addNotRemovedCompiationUnitEntries(unit, entry.getValue());
       }
     }
     return unit;
   }
 
   private static CompilationUnit buildSourceIoLibrary() throws Exception {
     CompilationUnit unit = new CompilationUnit(null, null, null, null, null);
     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")));
     unit.getDirectives().add(
         importDirective(
             "engine.dart",
             null,
             importShowCombinator("AnalysisContext", "AnalysisEngine")));
     unit.getDirectives().add(exportDirective("source.dart"));
     for (Entry<File, List<CompilationUnitMember>> entry : context.getFileToMembers().entrySet()) {
@@ skipping 12 matching lines @@
       if (isEnginePath(file, "source/")) {
         addNotRemovedCompiationUnitEntries(unit, entry.getValue());
       }
     }
     return unit;
   }
 
   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(
         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")
           || isEnginePath(file, "source/ContentCache.java")
           || isEnginePath(file, "source/DartUriResolver.java")
           || isEnginePath(file, "source/SourceFactory.java")
           || isEnginePath(file, "source/SourceContainer.java")
           || isEnginePath(file, "source/SourceKind.java")
           || isEnginePath(file, "source/UriKind.java")
           || isEnginePath(file, "source/UriResolver.java")
           || isEnginePath(file, "utilities/source/")) {
         addNotRemovedCompiationUnitEntries(unit, entry.getValue());
       }
     }
     return unit;
   }
 
   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("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));
     unit.getDirectives().add(importDirective(src_package + "source.dart", null));
     unit.getDirectives().add(importDirective(src_package + "error.dart", null));
     unit.getDirectives().add(importDirective(src_package + "scanner.dart", null));
     unit.getDirectives().add(
         importDirective(
             src_package + "element.dart",
             null,
@@ skipping 48 matching lines @@
 
   /**
    * @param enginePackage the sub-package in <code>com/google/dart/engine</code>.
    * @return <code>true</code> if given {@link File} is located in sub-package of Engine project.
    */
   private static boolean isEngineTestPath(File file, String enginePackage) {
     return file.getAbsolutePath().startsWith(
         engineTestFolder.getAbsolutePath() + "/com/google/dart/engine/" + enginePackage);
   }
 }