Issue 3530. Import elements into separate import namespace

compiler/java/com/google/dart/compiler/DeltaAnalyzer.java

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file

[Brian Wilkerson, 2012/06/14 20:57:07]

nit: copyright year

 // 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.io.CharStreams;
 import com.google.common.io.Closeables;
 import com.google.dart.compiler.ast.DartNode;
 import com.google.dart.compiler.ast.DartUnit;
 import com.google.dart.compiler.ast.LibraryNode;
 import com.google.dart.compiler.ast.LibraryUnit;
 import com.google.dart.compiler.metrics.CompilerMetrics;
 import com.google.dart.compiler.parser.DartParser;
 import com.google.dart.compiler.parser.DartScannerParserContext;
-import com.google.dart.compiler.resolver.TopLevelElementBuilder;
 import com.google.dart.compiler.resolver.CoreTypeProvider;
 import com.google.dart.compiler.resolver.CoreTypeProviderImplementation;
 import com.google.dart.compiler.resolver.Element;
 import com.google.dart.compiler.resolver.LibraryElement;
 import com.google.dart.compiler.resolver.MemberBuilder;
 import com.google.dart.compiler.resolver.Resolver;
 import com.google.dart.compiler.resolver.Scope;
 import com.google.dart.compiler.resolver.SupertypeResolver;
+import com.google.dart.compiler.resolver.TopLevelElementBuilder;
 import com.google.dart.compiler.type.TypeAnalyzer;
 
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
 import java.net.URI;
 
 class DeltaAnalyzer {
   private final SourceDelta delta;
   private final LibraryElement enclosingLibrary;
@@ skipping 40 matching lines @@
     return unit;
   }
 
   private Scope deltaLibraryScope(Source originalSource, DartUnit unit) {
     // Create a library unit which holds the new unit.
     LibraryUnit libraryUnit = new LibraryUnit(makeLibrarySource("delta"));
     // Copy all the imports
     for (LibraryNode path : enclosingLibrary.getLibraryUnit().getImportPaths()) {
       libraryUnit.addImportPath(path);
     }
-    for (LibraryUnit importUnit : enclosingLibrary.getLibraryUnit().getImports()) {
+    for (LibraryUnit importUnit : enclosingLibrary.getLibraryUnit().getImportedLibraries()) {
       libraryUnit.addImport(importUnit, importUnit.getEntryNode());
     }
-    libraryUnit.initializePrefixes(enclosingLibrary.getLibraryUnit());
     libraryUnit.putUnit(unit);
 
     // Create top-level elements for the new unit.
     new TopLevelElementBuilder().exec(libraryUnit, context);
     new TopLevelElementBuilder().fillInLibraryScope(libraryUnit, listener);
 
     // Copy all the elements from the old library, except the ones declared in the original source.
     Scope scope = libraryUnit.getElement().getScope();
     for (Element member : enclosingLibrary.getMembers()) {
       if (member.getSourceInfo().getSource() != originalSource) {
@@ skipping 113 matching lines @@
 
     @Override
     public void unitAboutToCompile(DartSource source, boolean diet) {
     }
 
     @Override
     public void unitCompiled(DartUnit unit) {
     }
   }
 }