diff --git a/platform/platform-api/src/com/intellij/openapi/options/ShowSettingsUtil.java b/platform/platform-api/src/com/intellij/openapi/options/ShowSettingsUtil.java index 34eb10ea1136..53176e1a304d 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/ShowSettingsUtil.java +++ b/platform/platform-api/src/com/intellij/openapi/options/ShowSettingsUtil.java @@ -28,7 +28,7 @@ public abstract class ShowSettingsUtil { return ServiceManager.getService(ShowSettingsUtil.class); } - public abstract void showSettingsDialog(Project project, ConfigurableGroup[] group); + public abstract void showSettingsDialog(Project project, ConfigurableGroup... group); public abstract void showSettingsDialog(@Nullable Project project, Class toSelect); diff --git a/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java b/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java index a2c825a63621..5ce91c879ad9 100644 --- a/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java +++ b/platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java @@ -26,7 +26,6 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.ex.ActionManagerEx; import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.components.ApplicationComponent; -import com.intellij.openapi.options.ConfigurableGroup; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.options.ex.IdeConfigurablesGroup; import com.intellij.openapi.options.ex.ProjectConfigurablesGroup; @@ -97,12 +96,8 @@ public class MacOSApplicationProvider implements ApplicationComponent { project = ProjectManager.getInstance().getDefaultProject(); } - ConfigurableGroup[] group = new ConfigurableGroup[]{ - new ProjectConfigurablesGroup(project), - new IdeConfigurablesGroup() - }; - - ShowSettingsUtil.getInstance().showSettingsDialog(project, group); + ShowSettingsUtil.getInstance().showSettingsDialog(project, new ProjectConfigurablesGroup(project), + new IdeConfigurablesGroup()); applicationEvent.setHandled(true); } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java index 2fe7f611501d..30459584327b 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java @@ -20,7 +20,6 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ex.ApplicationManagerEx; -import com.intellij.openapi.options.ConfigurableGroup; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.options.ex.IdeConfigurablesGroup; import com.intellij.openapi.options.ex.ProjectConfigurablesGroup; @@ -46,11 +45,6 @@ public class ShowSettingsAction extends AnAction implements DumbAware { project = ProjectManager.getInstance().getDefaultProject(); } - ConfigurableGroup[] group = { - new ProjectConfigurablesGroup(project), - new IdeConfigurablesGroup() - }; - final long startTime = System.nanoTime(); SwingUtilities.invokeLater(new Runnable() { public void run() { @@ -60,6 +54,7 @@ public class ShowSettingsAction extends AnAction implements DumbAware { } } }); - ShowSettingsUtil.getInstance().showSettingsDialog(project, group); + ShowSettingsUtil.getInstance().showSettingsDialog(project, new ProjectConfigurablesGroup(project), + new IdeConfigurablesGroup()); } } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/TemplateProjectPropertiesAction.java b/platform/platform-impl/src/com/intellij/ide/actions/TemplateProjectPropertiesAction.java index 9d154a86e163..75657c517ecb 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/TemplateProjectPropertiesAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/TemplateProjectPropertiesAction.java @@ -17,18 +17,15 @@ package com.intellij.ide.actions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.options.ConfigurableGroup; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.options.ex.ProjectConfigurablesGroup; -import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ex.ProjectManagerEx; public class TemplateProjectPropertiesAction extends AnAction implements DumbAware { public void actionPerformed(AnActionEvent e) { Project defaultProject = ProjectManagerEx.getInstanceEx().getDefaultProject(); - ShowSettingsUtil.getInstance().showSettingsDialog(defaultProject, new ConfigurableGroup[]{ - new ProjectConfigurablesGroup(defaultProject) - }); + ShowSettingsUtil.getInstance().showSettingsDialog(defaultProject, new ProjectConfigurablesGroup(defaultProject)); } }