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

comfortable API

Browse Source
This commit is contained in:
Dmitry Avdeev
2012-09-13 14:14:18 +04:00
parent adb89d397c
commit 330c5bb039
4 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/options/ShowSettingsUtil.java
+1 -1
View File
@@ -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);
platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java
+2 -7
View File
@@ -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);
}
platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java
+2 -7
View File
@@ -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());
}
}
platform/platform-impl/src/com/intellij/ide/actions/TemplateProjectPropertiesAction.java
+2 -5
View File
@@ -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));
}
}