From c2dd562a83d2d4f357024f161bf178ad098d13ca Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 9 Nov 2010 16:55:19 +0300 Subject: [PATCH] fix passing selected tab from ProjectSettingsService --- .../openapi/roots/ui/configuration/ModuleEditor.java | 5 +++-- .../roots/ui/configuration/ProjectStructureConfigurable.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java index 8af238b834d5..59e25af14f35 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java @@ -60,6 +60,7 @@ import java.util.List; @SuppressWarnings({"AssignmentToStaticFieldFromInstanceMethod"}) public abstract class ModuleEditor implements Place.Navigator, Disposable { + public static final String MODULE_TAB = "moduleTab"; private final Project myProject; private JPanel myGenericSettingsPanel; private ModifiableRootModel myModifiableRootModel; // important: in order to correctly update OrderEntries UI use corresponding proxy for the model @@ -246,12 +247,12 @@ public abstract class ModuleEditor implements Place.Navigator, Disposable { } public ActionCallback navigateTo(@Nullable final Place place, final boolean requestFocus) { - myTabbedPane.setSelectedTitle((String)place.getPath("moduleTab")); + myTabbedPane.setSelectedTitle((String)place.getPath(MODULE_TAB)); return new ActionCallback.Done(); } public void queryPlace(@NotNull final Place place) { - place.putPath("moduleTab", ourSelectedTabName); + place.putPath(MODULE_TAB, ourSelectedTabName); } public static String getSelectedTab(){ diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java index fac45969b2a7..63132c974ee3 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java @@ -359,7 +359,7 @@ public class ProjectStructureConfigurable extends BaseConfigurable implements Se if (moduleToSelect != null) { final Module module = ModuleManager.getInstance(myProject).findModuleByName(moduleToSelect); assert module != null; - place = place.putPath(ModuleStructureConfigurable.TREE_OBJECT, module); + place = place.putPath(ModuleStructureConfigurable.TREE_OBJECT, module).putPath(ModuleEditor.MODULE_TAB, tab); } return navigateTo(place, requestFocus); }