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

Configurable: allow third-party groups with hyper-links

Browse Source
This commit is contained in:
Gregory.Shrago
2015-08-24 22:52:18 +03:00
parent 601291cae4
commit 40e541db42
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java
+4 -1
View File
@@ -370,7 +370,10 @@ public class ConfigurableExtensionPointUtil {
return project == null || !project.isDefault() || !ConfigurableWrapper.isNonDefaultProject(configurable);
}
private static ResourceBundle getBundle(String resource, List<Configurable> configurables, ResourceBundle alternative) {
@Nullable
public static ResourceBundle getBundle(@NotNull String resource,
@Nullable Iterable<Configurable> configurables,
@Nullable ResourceBundle alternative) {
ResourceBundle bundle = OptionsBundle.getBundle();
if (getString(bundle, resource) != null) {
return bundle;
platform/platform-impl/src/com/intellij/openapi/options/newEditor/ConfigurableEditor.java
+10 -15
View File
@@ -24,16 +24,20 @@ import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.ex.AnActionListener;
import com.intellij.openapi.options.*;
import com.intellij.openapi.options.BaseConfigurable;
import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.options.ShowSettingsUtil;
import com.intellij.openapi.options.ex.ConfigurableCardPanel;
import com.intellij.openapi.options.ex.ConfigurableExtensionPointUtil;
import com.intellij.openapi.options.ex.ConfigurableVisitor;
import com.intellij.openapi.options.ex.ConfigurableWrapper;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.ActionCallback;
import com.intellij.openapi.util.Disposer;
import com.intellij.ui.JBColor;
import com.intellij.ui.RelativeFont;
import com.intellij.ui.components.labels.LinkLabel;
import com.intellij.util.containers.JBIterable;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.UIUtil;
import com.intellij.util.ui.update.MergingUpdateQueue;
@@ -300,19 +304,10 @@ class ConfigurableEditor extends AbstractEditor implements AnActionListener, AWT
}
private static String getString(Configurable configurable, String key) {
try {
if (configurable instanceof ConfigurableWrapper) {
ConfigurableWrapper wrapper = (ConfigurableWrapper)configurable;
ResourceBundle bundle = wrapper.getExtensionPoint().findBundle();
if (bundle != null) {
return CommonBundle.message(bundle, key);
}
}
return OptionsBundle.message(key);
}
catch (AssertionError error) {
return null;
}
JBIterable<Configurable> it = JBIterable.of(configurable).append(
JBIterable.of(configurable instanceof Configurable.Composite ? ((Configurable.Composite)configurable).getConfigurables() : null));
ResourceBundle bundle = ConfigurableExtensionPointUtil.getBundle(key, it, null);
return bundle != null ? bundle.getString(key) : null;
}
static ConfigurationException apply(Configurable configurable) {