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

@Nullables

Browse Source
This commit is contained in:
Dmitry Avdeev
2012-10-04 16:24:46 +04:00
parent bf5f320353
commit 76d758a038
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditorDialog.java
+4 -6
View File
@@ -52,7 +52,7 @@ public class OptionsEditorDialog extends DialogWrapper implements DataProvider{
public static final String DIMENSION_KEY = "OptionsEditor";
@NonNls static final String LAST_SELECTED_CONFIGURABLE = "options.lastSelected";
public OptionsEditorDialog(Project project, ConfigurableGroup[] groups, Configurable preselectedConfigurable) {
public OptionsEditorDialog(Project project, ConfigurableGroup[] groups, @Nullable Configurable preselectedConfigurable) {
super(project, true);
init(project, groups, preselectedConfigurable != null ? preselectedConfigurable : findLastSavedConfigurable(groups, project));
}
@@ -62,7 +62,7 @@ public class OptionsEditorDialog extends DialogWrapper implements DataProvider{
init(project, groups, getPreselectedByDisplayName(groups, preselectedConfigurableDisplayName, project));
}
private void init(final Project project, final ConfigurableGroup[] groups, final Configurable preselected) {
private void init(final Project project, final ConfigurableGroup[] groups, @Nullable final Configurable preselected) {
myProject = project;
myGroups = groups;
myPreselected = preselected;
@@ -72,6 +72,7 @@ public class OptionsEditorDialog extends DialogWrapper implements DataProvider{
init();
}
@Nullable
private static Configurable getPreselectedByDisplayName(final ConfigurableGroup[] groups, final String preselectedConfigurableDisplayName,
final Project project) {
Configurable result = findPreselectedByDisplayName(preselectedConfigurableDisplayName, groups);
@@ -182,6 +183,7 @@ public class OptionsEditorDialog extends DialogWrapper implements DataProvider{
return findConfigurableInGroups(id, groups);
}
@Nullable
private static Configurable findConfigurableInGroups(String id, Configurable.Composite... groups) {
// avoid unnecessary group expand: check top-level configurables in all groups before looking at children
for (Configurable.Composite group : groups) {
@@ -214,13 +216,9 @@ public class OptionsEditorDialog extends DialogWrapper implements DataProvider{
for (Configurable each : all) {
if (preselectedConfigurableDisplayName.equals(each.getDisplayName())) return each;
}
return null;
}
@Override
public void doCancelAction(final AWTEvent source) {
if (source instanceof KeyEvent || source instanceof ActionEvent) {