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

ShowSettingUtil: selecting configurable by class is fixed

Browse Source
This commit is contained in:
Dmitry Semeniouta
2013-11-06 18:42:04 +04:00
parent b9f0e95980
commit e27287df3d
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
+18 -8
View File
@@ -48,7 +48,7 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
private AtomicBoolean myShown = new AtomicBoolean(false);
@Override
public void showSettingsDialog(Project project, ConfigurableGroup[] group) {
public void showSettingsDialog(@NotNull Project project, @NotNull ConfigurableGroup[] group) {
try {
myShown.set(true);
_showSettingsDialog(project, group, null);
@@ -61,7 +61,7 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
}
}
private static void _showSettingsDialog(final Project project, ConfigurableGroup[] group, @Nullable Configurable toSelect) {
private static void _showSettingsDialog(@NotNull final Project project, @NotNull ConfigurableGroup[] group, @Nullable Configurable toSelect) {
group = filterEmptyGroups(group);
if (Registry.is("ide.perProjectModality")) {
new OptionsEditorDialog(project, group, toSelect, true).show();
@@ -78,15 +78,24 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
public void showSettingsDialog(@Nullable final Project project, final Class configurableClass) {
assert Configurable.class.isAssignableFrom(configurableClass) : "Not a configurable: " + configurableClass.getName();
Project actualProject = project != null ? project : ProjectManager.getInstance().getDefaultProject();
Configurable config = findByClass(new IdeConfigurablesGroup().getConfigurables(), configurableClass);
if (config == null && project != null) {
config = findByClass(new ProjectConfigurablesGroup(project).getConfigurables(), configurableClass);
ConfigurableGroup[] groups;
IdeConfigurablesGroup commonGroup = new IdeConfigurablesGroup();
ProjectConfigurablesGroup projectGroup = project == null ? null : new ProjectConfigurablesGroup(project);
if (projectGroup == null) {
groups = new ConfigurableGroup[] {commonGroup};
} else {
groups = new ConfigurableGroup[] {projectGroup, commonGroup};
}
Configurable config = findByClass(commonGroup.getConfigurables(), configurableClass);
if (config == null && projectGroup != null) {
config = findByClass(projectGroup.getConfigurables(), configurableClass);
}
assert config != null : "Cannot find configurable: " + configurableClass.getName();
showSettingsDialog(actualProject, config);
@NotNull Project nnProject = project != null ? project : ProjectManager.getInstance().getDefaultProject();
_showSettingsDialog(nnProject, groups, config);
}
@Nullable
@@ -188,7 +197,8 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
}, toSelect);
}
private static ConfigurableGroup[] filterEmptyGroups(final ConfigurableGroup[] group) {
@NotNull
private static ConfigurableGroup[] filterEmptyGroups(@NotNull final ConfigurableGroup[] group) {
List<ConfigurableGroup> groups = new ArrayList<ConfigurableGroup>();
for (ConfigurableGroup g : group) {
if (g.getConfigurables().length > 0) {