Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Unified Diff: compiler/java/com/google/dart/compiler/UrlLibrarySource.java

Issue 10837369: fix build failure, rename refactor take 2 (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 4 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
Index: compiler/java/com/google/dart/compiler/UrlLibrarySource.java
===================================================================
--- compiler/java/com/google/dart/compiler/UrlLibrarySource.java (revision 11101)
+++ compiler/java/com/google/dart/compiler/UrlLibrarySource.java (working copy)
@@ -35,7 +35,7 @@
try {
// Force the creation of an escaped relative URI to deal with spaces, etc.s
URI uri = getUri().resolve(new URI(null, null, relPath, null, null)).normalize();
- return new UrlDartSource(uri, relPath, this, systemLibraryManager);
+ return new UrlDartSource(uri, relPath, this, packageLibraryManager);
} catch (Throwable e) {
return null;
}
@@ -53,23 +53,23 @@
// Resolve relative reference out of one system library into another
if (PackageLibraryManager.isDartUri(uri)) {
if(path != null && path.startsWith("/..")) {
- URI fileUri = systemLibraryManager.resolveDartUri(uri);
- URI shortUri = systemLibraryManager.getShortUri(fileUri);
+ URI fileUri = packageLibraryManager.resolveDartUri(uri);
+ URI shortUri = packageLibraryManager.getShortUri(fileUri);
if (shortUri != null) {
uri = shortUri;
}
}
} else if (PackageLibraryManager.isPackageUri(uri)){
- URI fileUri = systemLibraryManager.resolveDartUri(uri);
+ URI fileUri = packageLibraryManager.resolveDartUri(uri);
if (fileUri != null){
uri = fileUri;
}
} else if (path != null && !(new File(path).exists())){
// resolve against package root directories to find file
- uri = systemLibraryManager.findExistingFileInPackages(uri);
+ uri = packageLibraryManager.findExistingFileInPackages(uri);
}
- return new UrlLibrarySource(uri, systemLibraryManager);
+ return new UrlLibrarySource(uri, packageLibraryManager);
} catch (Throwable e) {
return null;
}
« no previous file with comments | « compiler/java/com/google/dart/compiler/UrlDartSource.java ('k') | compiler/java/com/google/dart/compiler/UrlSource.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698