fix passing selected tab from ProjectSettingsService

This commit is contained in:
Dmitry Jemerov
2010-11-09 16:55:19 +03:00
parent d1164f1c36
commit c2dd562a83
2 changed files with 4 additions and 3 deletions
@@ -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(){
@@ -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);
}