| Index: compiler/java/com/google/dart/compiler/DartCompiler.java
|
| ===================================================================
|
| --- compiler/java/com/google/dart/compiler/DartCompiler.java (revision 11058)
|
| +++ compiler/java/com/google/dart/compiler/DartCompiler.java (working copy)
|
| @@ -145,7 +145,7 @@
|
| this.phases = config.getPhases();
|
| this.context = context;
|
| for (LibrarySource library : embedded) {
|
| - if (SystemLibraryManager.isDartSpec(library.getName())) {
|
| + if (PackageLibraryManager.isDartSpec(library.getName())) {
|
| LibrarySource foundLibrary = context.getSystemLibraryFor(library.getName());
|
| assert(foundLibrary != null);
|
| embeddedLibraries.add(foundLibrary);
|
| @@ -256,7 +256,7 @@
|
| }
|
|
|
| if (!incremental
|
| - || SystemLibraryManager.isDartUri(libSrc.getUri())
|
| + || PackageLibraryManager.isDartUri(libSrc.getUri())
|
| || isSourceOutOfDate(dartSrc)) {
|
| DartUnit unit = parse(dartSrc, lib.getPrefixes(), false);
|
| // If we just parsed unit of library, report problems.
|
| @@ -444,7 +444,7 @@
|
| throws IOException {
|
| String libSpec = libNode.getText();
|
| LibrarySource dep;
|
| - if (SystemLibraryManager.isDartSpec(libSpec)) {
|
| + if (PackageLibraryManager.isDartSpec(libSpec)) {
|
| dep = context.getSystemLibraryFor(libSpec);
|
| } else {
|
| dep = libSrc.getImportFor(libSpec);
|
| @@ -612,7 +612,7 @@
|
| private void validateLibraryDirectives() {
|
| for (LibraryUnit lib : getLibrariesToProcess()) {
|
| // don't need to validate system libraries
|
| - if (SystemLibraryManager.isDartUri(lib.getSource().getUri())) {
|
| + if (PackageLibraryManager.isDartUri(lib.getSource().getUri())) {
|
| continue;
|
| }
|
|
|
| @@ -655,7 +655,7 @@
|
| // check that each imported library has a library directive
|
| for (LibraryUnit importedLib : lib.getImportedLibraries()) {
|
|
|
| - if (SystemLibraryManager.isDartUri(importedLib.getSource().getUri())) {
|
| + if (PackageLibraryManager.isDartUri(importedLib.getSource().getUri())) {
|
| // system libraries are always valid
|
| continue;
|
| }
|
| @@ -1094,7 +1094,7 @@
|
| File outputDirectory = config.getOutputDirectory();
|
| DefaultDartArtifactProvider provider = new DefaultDartArtifactProvider(outputDirectory);
|
| // Compile the Dart application and its dependencies.
|
| - SystemLibraryManager libraryManager = config.getSystemLibraryManager();
|
| + PackageLibraryManager libraryManager = config.getSystemLibraryManager();
|
| final LibrarySource lib = new UrlLibrarySource(sourceFile.toURI(),libraryManager);
|
| DefaultDartCompilerListener listener;
|
| if (config.getCompilerOptions().showSourceFromAst()) {
|
| @@ -1204,7 +1204,7 @@
|
| public static LibraryUnit analyzeLibrary(LibrarySource lib, final Map<URI, DartUnit> parsedUnits,
|
| CompilerConfiguration config, DartArtifactProvider provider, DartCompilerListener listener)
|
| throws IOException {
|
| - final SystemLibraryManager manager = config.getSystemLibraryManager();
|
| + final PackageLibraryManager manager = config.getSystemLibraryManager();
|
| final HashMap<URI, LibraryUnit> resolvedLibs = new HashMap<URI, LibraryUnit>();
|
| SelectiveCache selectiveCache = new SelectiveCache() {
|
| @Override
|
|
|