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

allow passing resource class and correct relative path to xml resource

Browse Source
This commit is contained in:
Konstantin Bulenkov
2018-07-13 19:57:45 +02:00
parent 24e9236bc0
commit 821ce3504d
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/application/ex/DecodeDefaultsUtil.java
+12 -4
View File
@@ -36,14 +36,14 @@ public class DecodeDefaultsUtil {
public static URL getDefaults(Object requestor, @NotNull String componentResourcePath) {
URL url = RESOURCE_CACHE.get(componentResourcePath);
if (url == null) {
Class<?> requestorClass = requestor.getClass();
Class<?> requestorClass = requestor instanceof Class ? (Class<?>)requestor : requestor.getClass();
if (StringUtil.startsWithChar(componentResourcePath, '/')) {
url = requestorClass.getResource(componentResourcePath + FileStorageCoreUtil.DEFAULT_EXT);
url = requestorClass.getResource(appendExt(componentResourcePath));
}
else {
url = requestorClass.getResource('/' + ApplicationManagerEx.getApplicationEx().getName() + '/' + componentResourcePath + FileStorageCoreUtil.DEFAULT_EXT);
url = requestorClass.getResource(appendExt('/' + ApplicationManagerEx.getApplicationEx().getName() + '/' + componentResourcePath));
if (url == null) {
url = requestorClass.getResource('/' + componentResourcePath + FileStorageCoreUtil.DEFAULT_EXT);
url = requestorClass.getResource(appendExt('/' + componentResourcePath));
}
}
RESOURCE_CACHE.put(componentResourcePath, url);
@@ -51,6 +51,14 @@ public class DecodeDefaultsUtil {
return url;
}
private static String appendExt(@NotNull String s) {
return appendIfNeeded(s, FileStorageCoreUtil.DEFAULT_EXT);
}
private static String appendIfNeeded(@NotNull String head, @NotNull String tail) {
return head.endsWith(tail) ? head : head + tail;
}
@Nullable
public static InputStream getDefaultsInputStream(Object requestor, @NotNull String componentResourcePath) {
try {