MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Ilya Sergey
2009-10-22 16:52:55 +04:00
parent 75132b30d3 336115be62
commit 950b7b9d73
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/javaee/ExternalResourceManagerEx.java
+4
View File
@@ -18,6 +18,7 @@ package com.intellij.javaee;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* author: lesya
@@ -47,4 +48,7 @@ public abstract class ExternalResourceManagerEx extends ExternalResourceManager
public abstract void addExternalResourceListener(ExternalResourceListener listener);
public abstract void removeExternalResourceListener(ExternalResourceListener listener);
@Nullable
public abstract String getUserResourse(Project project, String url, String version);
}
xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java
+15 -2
View File
@@ -130,8 +130,8 @@ public class ExternalResourceManagerImpl extends ExternalResourceManagerEx imple
}
public String getResourceLocation(@NonNls String url, String version) {
Map<String, String> map = getMap(myResources, version, false);
String result = map != null ? map.get(url) : null;
String result = getUserResourse(url, version);
Map<String, String> map;
if (result == null) {
map = getMap(myStdResources.getValue(), version, false);
@@ -145,6 +145,19 @@ public class ExternalResourceManagerImpl extends ExternalResourceManagerEx imple
return result;
}
@Override
@Nullable
public String getUserResourse(Project project, String url, String version) {
String resourse = getProjectResources(project).getUserResourse(url, version);
return resourse == null ? getUserResourse(url, version) : resourse;
}
@Nullable
private String getUserResourse(String url, String version) {
Map<String, String> map = getMap(myResources, version, false);
return map != null ? map.get(url) : null;
}
public String getResourceLocation(@NonNls String url, @NotNull Project project) {
String location = getProjectResources(project).getResourceLocation(url);
return location == null || location.equals(url) ? getResourceLocation(url) : location;