From 57be14e46e6ded9ada0a727ffaa5ff362b21fef5 Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 1 Sep 2010 18:24:57 +0400 Subject: [PATCH] createXxxConfigurable methods replaced with direct instantiations --- .../images/options/impl/OptionsConfigurabe.java | 3 +-- .../compiler/impl/CompilerErrorTreeView.java | 3 +-- .../options/CodeStyleSettingsUtilImpl.java | 5 ++--- .../codeInsight/actions/ReformatCodeAction.java | 3 +-- .../impl/config/IntentionDescriptionPanel.java | 3 ++- .../src/com/intellij/ide/todo/TodoPanel.java | 2 +- .../ConfigureFileDefaultEncodingAction.java | 5 ++--- .../ChangeTemplateDataLanguageAction.java | 5 ++--- .../TemplateLanguageErrorQuickFixProvider.java | 5 ++--- .../intellij/openapi/options/ShowSettingsUtil.java | 10 ++-------- .../com/intellij/ide/actions/CustomizeUIAction.java | 2 +- .../intellij/ide/actions/ShowSettingsUtilImpl.java | 13 ------------- .../ide/plugins/PluginManagerUISettings.java | 5 +++++ .../updateSettings/impl/AbstractUpdateDialog.java | 3 +-- .../wm/impl/welcomeScreen/WelcomeScreen.java | 9 +++------ .../copyright/actions/GenerateCopyrightAction.java | 4 +--- .../jetbrains/plugins/groovy/gant/GantRunner.java | 3 +-- .../plugins/groovy/gradle/GradleScriptType.java | 3 +-- .../maven/project/actions/EditSettingsAction.java | 3 +-- .../impl/FileAssociationsConfigurable.java | 3 +-- .../quickfix/ManuallySetupExtResourceAction.java | 5 ++--- 21 files changed, 33 insertions(+), 64 deletions(-) diff --git a/images/src/org/intellij/images/options/impl/OptionsConfigurabe.java b/images/src/org/intellij/images/options/impl/OptionsConfigurabe.java index 5c29e98ab754..19bd30221f5b 100644 --- a/images/src/org/intellij/images/options/impl/OptionsConfigurabe.java +++ b/images/src/org/intellij/images/options/impl/OptionsConfigurabe.java @@ -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 diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java index ced2a010afca..aaa3061bb4fc 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java @@ -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)); } } diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSettingsUtilImpl.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSettingsUtilImpl.java index 6294f63bcb31..f8528b0eea60 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSettingsUtilImpl.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSettingsUtilImpl.java @@ -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); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java index f84c30cbfddb..c954b53304a8 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java @@ -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()); } } })); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.java index e718daaab29c..def771dcf3a9 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.java @@ -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() { diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java index 821f01b54104..e59e4dca73e9 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java @@ -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()); } } ); diff --git a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/ConfigureFileDefaultEncodingAction.java b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/ConfigureFileDefaultEncodingAction.java index 84b5008e9b14..0bd70274af09 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/ConfigureFileDefaultEncodingAction.java +++ b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/ConfigureFileDefaultEncodingAction.java @@ -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); diff --git a/platform/lang-impl/src/com/intellij/psi/templateLanguages/ChangeTemplateDataLanguageAction.java b/platform/lang-impl/src/com/intellij/psi/templateLanguages/ChangeTemplateDataLanguageAction.java index ab69ad5b1f3b..d9faa258f3b8 100644 --- a/platform/lang-impl/src/com/intellij/psi/templateLanguages/ChangeTemplateDataLanguageAction.java +++ b/platform/lang-impl/src/com/intellij/psi/templateLanguages/ChangeTemplateDataLanguageAction.java @@ -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); diff --git a/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateLanguageErrorQuickFixProvider.java b/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateLanguageErrorQuickFixProvider.java index 56d578ed3c6c..a615df118ba6 100644 --- a/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateLanguageErrorQuickFixProvider.java +++ b/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateLanguageErrorQuickFixProvider.java @@ -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); 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 949aae5aca71..34eb10ea1136 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/ShowSettingsUtil.java +++ b/platform/platform-api/src/com/intellij/openapi/options/ShowSettingsUtil.java @@ -46,21 +46,15 @@ public abstract class ShowSettingsUtil { public abstract boolean editConfigurable(Project project, @NonNls String dimensionServiceKey, Configurable configurable); - @NotNull - public abstract T createProjectConfigurable(@NotNull Project project, Class configurableClass); - - @NotNull - public abstract T createApplicationConfigurable(Class 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 findProjectConfigurable(Project project, Class confClass); /** - * @deprecated use {@link #createApplicationConfigurable} instead + * @deprecated create a new instance of configurable instead */ public abstract T findApplicationConfigurable(Class confClass); } \ No newline at end of file diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CustomizeUIAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CustomizeUIAction.java index e9cc9e855071..a04d9048e553 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CustomizeUIAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CustomizeUIAction.java @@ -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()); } } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java index 72a04e1deb3b..5e5103c6f671 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java @@ -150,19 +150,6 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil { return editor.isOK(); } - @NotNull - @Override - public T createProjectConfigurable(@NotNull Project project, - Class configurableClass) { - return ConfigurableExtensionPointUtil.createProjectConfigurable(project, configurableClass); - } - - @NotNull - @Override - public T createApplicationConfigurable(Class configurableClass) { - return ConfigurableExtensionPointUtil.createApplicationConfigurable(configurableClass); - } - public boolean editConfigurable(Component parent, Configurable configurable) { return editConfigurable(parent, configurable, null); } diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerUISettings.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerUISettings.java index 005bb98bc76b..e269ad987c97 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerUISettings.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerUISettings.java @@ -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 0)) { return false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleScriptType.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleScriptType.java index 2c94da306d0d..f2c3294cc8b8 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleScriptType.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleScriptType.java @@ -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; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/EditSettingsAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/EditSettingsAction.java index 1db71388efcf..6c25d5a78a58 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/EditSettingsAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/EditSettingsAction.java @@ -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)); } } \ No newline at end of file diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java index 6527b04b0177..81600d469ee5 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java @@ -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() { diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ManuallySetupExtResourceAction.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ManuallySetupExtResourceAction.java index e9d00bbb2aa0..e2ff6e831beb 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ManuallySetupExtResourceAction.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ManuallySetupExtResourceAction.java @@ -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); }