Issue 3530. Import elements into separate import namespace

compiler/java/com/google/dart/compiler/DartCompiler.java

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 package com.google.dart.compiler;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Sets.SetView;
@@ skipping 370 matching lines @@
         for (LibrarySource embedded : embeddedLibraries) {
           updateLibraries(embedded);
         }
 
         for (LibraryUnit lib : getLibrariesToProcess()) {
           for (LibrarySource embedded : embeddedLibraries) {
             LibraryUnit imp = libraries.get(embedded.getUri());
             // Check that the current library is not the embedded library, and
             // that the current library does not already import the embedded
             // library.
-            if (lib != imp && !lib.hasImport(imp)) {
+            if (lib != imp && !lib.hasImport(null, imp)) {
               lib.addImport(imp, null);
             }
           }
         }
       } finally {
         Tracer.end(importEvent);
       }
     }
 
     /**
@@ skipping 239 matching lines @@
         // Validate import prefixes.
         for (LibraryNode importNode : lib.getImportPaths()) {
           String prefix = importNode.getPrefix();
           if (DartParser.PSEUDO_KEYWORDS_SET.contains(prefix)) {
             context.onError(new DartCompilationError(importNode.getSourceInfo(),
                 ResolverErrorCode.BUILT_IN_IDENTIFIER_AS_IMPORT_PREFIX, prefix));
           }
         }
 
         // check that each imported library has a library directive
-        for (LibraryUnit importedLib : lib.getImports()) {
+        for (LibraryUnit importedLib  : lib.getImportedLibraries()) {
 
           if (SystemLibraryManager.isDartUri(importedLib.getSource().getUri())) {
             // system libraries are always valid
             continue;
           }
 
           // get the dart unit corresponding to this library
           DartUnit unit = importedLib.getSelfDartUnit();
           if (unit.isDiet()) {
             // don't need to check a unit that hasn't changed
@@ skipping 470 matching lines @@
                                   DartArtifactProvider provider,
                                   DartCompilerListener listener) throws IOException {
     DartCompilerMainContext context = new DartCompilerMainContext(lib, provider, listener,
                                                                   config);
     if (config.getCompilerOptions().shouldExposeCoreImpl()) {
       if (embeddedLibraries == null) {
         embeddedLibraries = Lists.newArrayList();
       }
       // use a place-holder LibrarySource instance, to be replaced when embedded
       // in the compiler, where the dart uri can be resolved.
-      embeddedLibraries.add(new NamedPlaceHolderLibrarySource("dart:coreimpl"));
+      embeddedLibraries.add(new NamedPlaceHolderLibrarySource("dart:core"));
     }
 
     new Compiler(lib, embeddedLibraries, config, context).compile();
     int errorCount = context.getErrorCount();
     if (config.typeErrorsAreFatal()) {
       errorCount += context.getTypeErrorCount();
     }
     if (config.warningsAreFatal()) {
       errorCount += context.getWarningCount();
     }
@@ skipping 149 matching lines @@
     }
     seen.add(libraryUnit.getElement());
     if (uri.equals(libraryUnit.getName())) {
       return libraryUnit;
     }
     for (LibraryNode src : libraryUnit.getSourcePaths()) {
       if (src.getText().equals(uri)) {
         return libraryUnit;
       }
     }
-    for (LibraryUnit importedLibrary : libraryUnit.getImports()) {
+    for (LibraryUnit importedLibrary : libraryUnit.getImportedLibraries()) {
       LibraryUnit unit = findLibrary(importedLibrary, uri, seen);
       if (unit != null) {
         return unit;
       }
     }
     return null;
   }
 
   public static LibraryUnit getCoreLib(LibraryUnit libraryUnit) {
     return findLibrary(libraryUnit, "dart:core", new HashSet<LibraryElement>());
   }
 }