From a32c599d25aa71a2e61fa7161084135fccf574f9 Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 1 Sep 2010 16:47:38 +0400 Subject: [PATCH] inspections configurable extension upgraded --- .../options/colors/ScopeColorsPageFactory.java | 15 ++++++--------- .../idea/copyright/ui/ProjectSettingsPanel.java | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/ScopeColorsPageFactory.java b/platform/lang-impl/src/com/intellij/application/options/colors/ScopeColorsPageFactory.java index 80403e6b6834..cb9d3bc8998b 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/ScopeColorsPageFactory.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/ScopeColorsPageFactory.java @@ -16,20 +16,19 @@ package com.intellij.application.options.colors; +import com.intellij.ide.DataManager; import com.intellij.ide.util.scopeChooser.EditScopesDialog; -import com.intellij.openapi.options.ShowSettingsUtil; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.project.ProjectManager; +import com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.options.newEditor.OptionsEditor; -import com.intellij.ide.DataManager; -import com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.project.ProjectManager; import javax.swing.*; import java.awt.*; -import java.awt.event.ActionListener; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; class ScopeColorsPageFactory implements ColorAndFontPanelFactory { public NewColorAndFontPanel createPanel(ColorAndFontOptions options) { @@ -72,9 +71,7 @@ class ScopeColorsPageFactory implements ColorAndFontPanelFactory { final OptionsEditor optionsEditor = OptionsEditor.KEY.getData(DataManager.getInstance().getDataContext()); if (optionsEditor != null) { try { - final ScopeChooserConfigurable projectConfigurable = - ShowSettingsUtil.getInstance().findProjectConfigurable(project, ScopeChooserConfigurable.class); - optionsEditor.select(projectConfigurable); + optionsEditor.select(ScopeChooserConfigurable.class); } catch (IllegalStateException ex) { EditScopesDialog.editConfigurable(project, null); } diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java index c1dffc8acbc7..1e9820535305 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java @@ -123,7 +123,7 @@ public class ProjectSettingsPanel extends PanelWithButtons { if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { final OptionsEditor optionsEditor = OptionsEditor.KEY.getData(DataManager.getInstance().getDataContext()); if (optionsEditor != null) { - optionsEditor.select(ScopeChooserConfigurable.getInstance(myProject)); + optionsEditor.select(ScopeChooserConfigurable.class); } } }