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

createXxxConfigurable methods replaced with direct instantiations

Browse Source
This commit is contained in:
nik
2010-09-02 10:22:30 +04:00
parent 6eda5ef3e5
commit 57be14e46e
21 changed files with 33 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
images/src/org/intellij/images/options/impl/OptionsConfigurabe.java
+1 -2
View File
@@ -97,8 +97,7 @@ public final class OptionsConfigurabe extends BaseConfigurableWithChangeSupport
public static void show(Project project) {
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
OptionsConfigurabe component = util.createApplicationConfigurable(OptionsConfigurabe.class);
util.editConfigurable(project, component);
util.editConfigurable(project, new OptionsConfigurabe());
}
@NonNls
java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java
+1 -2
View File
@@ -90,8 +90,7 @@ public class CompilerErrorTreeView extends NewErrorTreeViewPanel {
Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext());
if (project == null) return;
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
final CompilerConfigurable configurable = util.createProjectConfigurable(project, CompilerConfigurable.class);
util.editConfigurable(project, configurable);
util.editConfigurable(project, new CompilerConfigurable(project));
}
}
platform/lang-impl/src/com/intellij/application/options/CodeStyleSettingsUtilImpl.java
+2 -3
View File
@@ -31,9 +31,8 @@ public class CodeStyleSettingsUtilImpl extends CodeStyleSettingsUtil {
public boolean showCodeStyleSettings(Project project, final Class pageToSelect) {
CodeStyleSettingsManager settingsManager = CodeStyleSettingsManager.getInstance(project);
CodeStyleSettings savedSettings = settingsManager.getCurrentSettings().clone();
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
final CodeStyleSchemesConfigurable configurable = util.createProjectConfigurable(project, CodeStyleSchemesConfigurable.class);
util.editConfigurable(project, configurable, new Runnable() {
final CodeStyleSchemesConfigurable configurable = new CodeStyleSchemesConfigurable(project);
ShowSettingsUtil.getInstance().editConfigurable(project, configurable, new Runnable() {
public void run() {
if (pageToSelect != null) {
configurable.selectPage(pageToSelect);
platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
+1 -2
View File
@@ -181,9 +181,8 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
public void hyperlinkUpdate(@NotNull Notification notification, @NotNull HyperlinkEvent e) {
if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
EditorOptions editorOptions = util.createApplicationConfigurable(EditorOptions.class);
IdeFrame ideFrame = WindowManagerEx.getInstanceEx().findFrameFor(null);
util.editConfigurable((JFrame)ideFrame, editorOptions);
util.editConfigurable((JFrame)ideFrame, new EditorOptions());
}
}
}));
platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.java
+2 -1
View File
@@ -23,6 +23,7 @@ import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.ide.plugins.PluginManager;
import com.intellij.ide.plugins.PluginManagerConfigurable;
import com.intellij.ide.plugins.PluginManagerUISettings;
import com.intellij.ide.ui.search.SearchUtil;
import com.intellij.openapi.application.ApplicationNamesInfo;
import com.intellij.openapi.diagnostic.Logger;
@@ -98,7 +99,7 @@ public class IntentionDescriptionPanel {
label.addHyperlinkListener(new HyperlinkListener() {
public void hyperlinkUpdate(HyperlinkEvent e) {
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
final PluginManagerConfigurable pluginConfigurable = util.createApplicationConfigurable(PluginManagerConfigurable.class);
final PluginManagerConfigurable pluginConfigurable = new PluginManagerConfigurable(PluginManagerUISettings.getInstance());
final Project project = ProjectManager.getInstance().getDefaultProject();
util.editConfigurable(project, pluginConfigurable, new Runnable(){
public void run() {
platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java
+1 -1
View File
@@ -605,7 +605,7 @@ abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavig
IdeBundle.message("action.todo.edit.filters"), IconLoader.getIcon("/general/ideOptions.png")) {
public void actionPerformed(AnActionEvent e) {
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
util.editConfigurable(myProject, util.createApplicationConfigurable(TodoConfigurable.class));
util.editConfigurable(myProject, new TodoConfigurable());
}
}
);
platform/lang-impl/src/com/intellij/openapi/vfs/encoding/ConfigureFileDefaultEncodingAction.java
+2 -3
View File
@@ -28,9 +28,8 @@ public class ConfigureFileDefaultEncodingAction extends AnAction {
final Project project = e.getData(PlatformDataKeys.PROJECT);
final VirtualFile virtualFile = e.getData(PlatformDataKeys.VIRTUAL_FILE);
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
final FileEncodingConfigurable configurable = util.createProjectConfigurable(project, FileEncodingConfigurable.class);
util.editConfigurable(project, configurable, new Runnable(){
final FileEncodingConfigurable configurable = new FileEncodingConfigurable(project);
ShowSettingsUtil.getInstance().editConfigurable(project, configurable, new Runnable(){
public void run() {
if (virtualFile != null) {
configurable.selectFile(virtualFile);
platform/lang-impl/src/com/intellij/psi/templateLanguages/ChangeTemplateDataLanguageAction.java
+2 -3
View File
@@ -58,9 +58,8 @@ public class ChangeTemplateDataLanguageAction extends AnAction {
if (project == null) return;
final VirtualFile virtualFile = e.getData(PlatformDataKeys.VIRTUAL_FILE);
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
final TemplateDataLanguageConfigurable configurable = util.createProjectConfigurable(project, TemplateDataLanguageConfigurable.class);
util.editConfigurable(project, configurable, new Runnable() {
final TemplateDataLanguageConfigurable configurable = new TemplateDataLanguageConfigurable(project);
ShowSettingsUtil.getInstance().editConfigurable(project, configurable, new Runnable() {
public void run() {
if (virtualFile != null) {
configurable.selectFile(virtualFile);
platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateLanguageErrorQuickFixProvider.java
+2 -3
View File
@@ -68,9 +68,8 @@ public class TemplateLanguageErrorQuickFixProvider implements ErrorQuickFixProvi
}
public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
final TemplateDataLanguageConfigurable configurable = util.createProjectConfigurable(project, TemplateDataLanguageConfigurable.class);
util.editConfigurable(project, configurable, new Runnable() {
final TemplateDataLanguageConfigurable configurable = new TemplateDataLanguageConfigurable(project);
ShowSettingsUtil.getInstance().editConfigurable(project, configurable, new Runnable() {
public void run() {
if (virtualFile != null) {
configurable.selectFile(virtualFile);
platform/platform-api/src/com/intellij/openapi/options/ShowSettingsUtil.java
+2 -8
View File
@@ -46,21 +46,15 @@ public abstract class ShowSettingsUtil {
public abstract boolean editConfigurable(Project project, @NonNls String dimensionServiceKey, Configurable configurable);
@NotNull
public abstract <T extends Configurable> T createProjectConfigurable(@NotNull Project project, Class<T> configurableClass);
@NotNull
public abstract <T extends Configurable> T createApplicationConfigurable(Class<T> configurableClass);
public abstract boolean editConfigurable(Component parent, String dimensionServiceKey, Configurable configurable);
/**
* @deprecated use {@link #createProjectConfigurable} instead
* @deprecated create a new instance of configurable instead
*/
public abstract <T extends Configurable> T findProjectConfigurable(Project project, Class<T> confClass);
/**
* @deprecated use {@link #createApplicationConfigurable} instead
* @deprecated create a new instance of configurable instead
*/
public abstract <T extends Configurable> T findApplicationConfigurable(Class<T> confClass);
}
platform/platform-impl/src/com/intellij/ide/actions/CustomizeUIAction.java
+1 -1
View File
@@ -33,6 +33,6 @@ public class CustomizeUIAction extends AnAction {
public void actionPerformed(AnActionEvent e) {
final Project project = e.getData(PlatformDataKeys.PROJECT);
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
util.editConfigurable(project, util.createApplicationConfigurable(CustomizationConfigurable.class));
util.editConfigurable(project, new CustomizationConfigurable());
}
}
platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
-13
View File
@@ -150,19 +150,6 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
return editor.isOK();
}
@NotNull
@Override
public <T extends Configurable> T createProjectConfigurable(@NotNull Project project,
Class<T> configurableClass) {
return ConfigurableExtensionPointUtil.createProjectConfigurable(project, configurableClass);
}
@NotNull
@Override
public <T extends Configurable> T createApplicationConfigurable(Class<T> configurableClass) {
return ConfigurableExtensionPointUtil.createApplicationConfigurable(configurableClass);
}
public boolean editConfigurable(Component parent, Configurable configurable) {
return editConfigurable(parent, configurable, null);
}
platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerUISettings.java
+5
View File
@@ -16,6 +16,7 @@
package com.intellij.ide.plugins;
import com.intellij.openapi.components.PersistentStateComponent;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.components.State;
import com.intellij.openapi.components.Storage;
import com.intellij.openapi.ui.SplitterProportionsData;
@@ -56,6 +57,10 @@ public class PluginManagerUISettings implements PersistentStateComponent<Element
private final TableColumnsProportionData myAvailableTableProportions = new TableColumnsProportionData();
private final TableColumnsProportionData myInstalledTableProportions = new TableColumnsProportionData();
public static PluginManagerUISettings getInstance() {
return ServiceManager.getService(PluginManagerUISettings.class);
}
public Element getState() {
Element element = new Element("state");
try {
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/AbstractUpdateDialog.java
+1 -2
View File
@@ -77,10 +77,9 @@ public abstract class AbstractUpdateDialog extends DialogWrapper {
public void hyperlinkUpdate(final HyperlinkEvent e) {
if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
UpdateSettingsConfigurable updatesSettings = util.createApplicationConfigurable(UpdateSettingsConfigurable.class);
UpdateSettingsConfigurable updatesSettings = new UpdateSettingsConfigurable();
updatesSettings.setCheckNowEnabled(false);
util.editConfigurable(panel, updatesSettings);
updatesSettings.setCheckNowEnabled(true);
}
}
});
platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreen.java
+3 -6
View File
@@ -17,10 +17,7 @@ package com.intellij.openapi.wm.impl.welcomeScreen;
import com.intellij.ide.BrowserUtil;
import com.intellij.ide.DataManager;
import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.ide.plugins.IdeaPluginDescriptorImpl;
import com.intellij.ide.plugins.PluginManager;
import com.intellij.ide.plugins.PluginManagerConfigurable;
import com.intellij.ide.plugins.*;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.ex.ActionButtonLook;
import com.intellij.openapi.actionSystem.impl.PresentationFactory;
@@ -370,8 +367,8 @@ public class WelcomeScreen {
gBC = new GridBagConstraints(2, 0, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(13, 0, 0, 10), 0, 0);
MyActionButton openPluginManager = new PluginsActionButton(OPEN_PLUGINS_ICON, null) {
protected void onPress(InputEvent e) {
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
util.editConfigurable(myPluginsPanel, util.createApplicationConfigurable(PluginManagerConfigurable.class));
final PluginManagerConfigurable configurable = new PluginManagerConfigurable(PluginManagerUISettings.getInstance());
ShowSettingsUtil.getInstance().editConfigurable(myPluginsPanel, configurable);
}
public Dimension getMaximumSize() {
plugins/copyright/src/com/maddyhome/idea/copyright/actions/GenerateCopyrightAction.java
+1 -3
View File
@@ -78,9 +78,7 @@ public class GenerateCopyrightAction extends AnAction
if (CopyrightManager.getInstance(project).getCopyrightOptions(file) == null) {
if (Messages.showOkCancelDialog(project, "No copyright configured for current file. Would you like to edit copyright settings?", "No copyright available", Messages.getQuestionIcon()) == DialogWrapper.OK_EXIT_CODE) {
final CopyrightProjectConfigurable projectConfigurable =
ShowSettingsUtil.getInstance().createProjectConfigurable(project, CopyrightProjectConfigurable.class);
ShowSettingsUtil.getInstance().showSettingsDialog(project, projectConfigurable);
ShowSettingsUtil.getInstance().showSettingsDialog(project, new CopyrightProjectConfigurable(project));
} else {
return;
}
plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantRunner.java
+1 -2
View File
@@ -53,8 +53,7 @@ public class GantRunner extends GroovyScriptRunner {
.showOkCancelDialog("Gant is not configured. Do you want to configure it?", "Configure Gant SDK",
GantIcons.GANT_ICON_16x16);
if (result == 0) {
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
util.editConfigurable(project, util.createProjectConfigurable(project, GantConfigurable.class));
ShowSettingsUtil.getInstance().editConfigurable(project, new GantConfigurable(project));
}
if (!(GantUtils.getSDKInstallPath(module, project).length() > 0)) {
return false;
plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleScriptType.java
+1 -2
View File
@@ -152,8 +152,7 @@ public class GradleScriptType extends GroovyScriptType {
.showOkCancelDialog("Gradle is not configured. Do you want to configure it?", "Configure Gradle SDK",
GradleLibraryManager.GRADLE_ICON);
if (result == 0) {
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
util.editConfigurable(project, util.createProjectConfigurable(project, GradleConfigurable.class));
ShowSettingsUtil.getInstance().editConfigurable(project, new GradleConfigurable(project));
}
if (GradleLibraryManager.getSdkHome(module, project) == null) {
return false;
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/EditSettingsAction.java
+1 -2
View File
@@ -29,7 +29,6 @@ public class EditSettingsAction extends MavenAction {
}
protected static void showSettingsFor(Project project) {
MavenSettings configurable = ShowSettingsUtil.getInstance().createProjectConfigurable(project, MavenSettings.class);
ShowSettingsUtil.getInstance().showSettingsDialog(project, configurable);
ShowSettingsUtil.getInstance().showSettingsDialog(project, new MavenSettings(project));
}
}
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java
+1 -2
View File
@@ -92,8 +92,7 @@ public class FileAssociationsConfigurable implements SearchableConfigurable, Non
}
public static void editAssociations(Project project, final PsiFile file) {
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
final FileAssociationsConfigurable instance = util.createProjectConfigurable(project, FileAssociationsConfigurable.class);
final FileAssociationsConfigurable instance = new FileAssociationsConfigurable(project);
ShowSettingsUtil.getInstance().editConfigurable(project, instance, new Runnable() {
public void run() {
xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ManuallySetupExtResourceAction.java
+2 -3
View File
@@ -35,10 +35,9 @@ public class ManuallySetupExtResourceAction extends BaseExtResourceAction {
protected void doInvoke(@NotNull final PsiFile file, final int offset, @NotNull final String uri, final Editor editor) throws IncorrectOperationException {
ExternalResourceManager.getInstance().addResource(uri,"");
final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
final Project project = file.getProject();
final ExternalResourceConfigurable component = util.createProjectConfigurable(project, ExternalResourceConfigurable.class);
util.editConfigurable(project, component, new Runnable() {
final ExternalResourceConfigurable component = new ExternalResourceConfigurable(project);
ShowSettingsUtil.getInstance().editConfigurable(project, component, new Runnable() {
public void run() {
component.selectResource(uri);
}