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

dynamic bundle: don't fail when application hasn't loaded

Browse Source 
GitOrigin-RevId: 31f814de3c012482f09bd85a7e2ea4103cf4dd40
This commit is contained in:
Sergey Ignatov
2019-12-18 19:31:34 +00:00
committed by intellij-monorepo-bot
parent c46675b80b
commit 67d3dd990b
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/DynamicBundle.java
+13 -7
View File
@@ -32,7 +32,7 @@ public abstract class DynamicBundle extends AbstractBundle {
ResourceBundle pluginBundle = super.findBundle(pathToBundle, langBundle.getLoaderForClass(), control);
if (pluginBundle == null) return base;
try {
if (SET_PARENT != null) {
SET_PARENT.invoke(pluginBundle, base);
@@ -40,6 +40,7 @@ public abstract class DynamicBundle extends AbstractBundle {
}
catch (Exception e) {
LOG.warn(e);
return base;
}
return pluginBundle;
}
@@ -47,11 +48,18 @@ public abstract class DynamicBundle extends AbstractBundle {
// todo: one language per application
@Nullable
private static LanguageBundleEP findLanguageBundle() {
Application application = ApplicationManager.getApplication();
if (application.isUnitTestMode() && !application.getExtensionArea().hasExtensionPoint(LanguageBundleEP.EP_NAME)) {
try {
Application application = ApplicationManager.getApplication();
if (application == null) return null;
if (application.isUnitTestMode() && !application.getExtensionArea().hasExtensionPoint(LanguageBundleEP.EP_NAME)) {
return null;
}
return LanguageBundleEP.EP_NAME.findExtension(LanguageBundleEP.class);
}
catch (Exception e) {
LOG.error(e);
return null;
}
return LanguageBundleEP.EP_NAME.findExtension(LanguageBundleEP.class);
}
public static final DynamicBundle INSTANCE = new DynamicBundle("") {
@@ -60,6 +68,4 @@ public abstract class DynamicBundle extends AbstractBundle {
public static class LanguageBundleEP extends AbstractExtensionPointBean {
public static final ExtensionPointName<LanguageBundleEP> EP_NAME = ExtensionPointName.create("com.intellij.languageBundle");
}
}
}