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

NPE fix

Browse Source
This commit is contained in:
Gregory.Shrago
2013-10-29 22:53:23 +04:00
parent 2d080ba892
commit a9fb95aef3
2 changed files with 10 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
+8 -7
View File
@@ -80,7 +80,7 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
Project actualProject = project != null ? project : ProjectManager.getInstance().getDefaultProject();
Configurable config = findByClass(new IdeConfigurablesGroup().getConfigurables(), configurableClass);
if (config == null) {
if (config == null && project != null) {
config = findByClass(new ProjectConfigurablesGroup(project).getConfigurables(), configurableClass);
}
@@ -103,23 +103,24 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
public void showSettingsDialog(@Nullable final Project project, @NotNull final String nameToSelect) {
ConfigurableGroup[] group;
if (project == null) {
group = new ConfigurableGroup[] {new IdeConfigurablesGroup()};
} else {
group = new ConfigurableGroup[] {new ProjectConfigurablesGroup(project), new IdeConfigurablesGroup()};
group = new ConfigurableGroup[]{new IdeConfigurablesGroup()};
}
else {
group = new ConfigurableGroup[]{new ProjectConfigurablesGroup(project), new IdeConfigurablesGroup()};
}
Project actualProject = project != null ? project : ProjectManager.getInstance().getDefaultProject();
Project actualProject = project != null ? project : ProjectManager.getInstance().getDefaultProject();
group = filterEmptyGroups(group);
OptionsEditorDialog dialog;
if (Registry.is("ide.perProjectModality")) {
dialog = new OptionsEditorDialog(actualProject, group, nameToSelect, true);
} else {
}
else {
dialog = new OptionsEditorDialog(actualProject, group, nameToSelect);
}
dialog.show();
}
public static void showSettingsDialog(@Nullable Project project, final String id2Select, final String filter) {
platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurablesGroup.java
+2 -1
View File
@@ -19,6 +19,7 @@ import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.ConfigurableGroup;
import com.intellij.openapi.options.OptionsBundle;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
/**
* @author max
@@ -26,7 +27,7 @@ import com.intellij.openapi.project.Project;
public class ProjectConfigurablesGroup extends ConfigurablesGroupBase implements ConfigurableGroup {
private final Project myProject;
public ProjectConfigurablesGroup(Project project) {
public ProjectConfigurablesGroup(@NotNull Project project) {
super(project, Configurable.PROJECT_CONFIGURABLE, true);
myProject = project;
}