From 0b582bf6d54fa7cf43105eb6f623146359f8720e Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Wed, 30 May 2012 21:42:40 +0400 Subject: [PATCH] Configurables no longer have icons. --- .../options/impl/OptionsConfigurabe.java | 7 +------ .../eclipse/EclipseCompilerConfigurable.java | 4 ---- .../javaCompiler/javac/JavacConfigurable.java | 4 ---- .../javaCompiler/jikes/JikesConfigurable.java | 4 ---- .../AnnotationProcessorsConfigurable.java | 4 ---- .../options/CompilerConfigurable.java | 8 -------- .../options/CompilerUIConfigurable.java | 4 ---- .../compiler/options/JavaCompilersTab.java | 4 ---- .../compiler/options/RmicConfigurable.java | 4 ---- .../actions/AdjustArrayRangeAction.java | 7 ------- .../actions/CustomizeContextViewAction.java | 5 ----- .../DebuggerDataViewsConfigurable.java | 4 ---- .../settings/DebuggerHotswapConfigurable.java | 6 +----- .../DebuggerLaunchingConfigurable.java | 5 ----- .../DebuggerSteppingConfigurable.java | 6 +----- .../settings/ThreadsViewConfigurable.java | 4 ---- .../settings/UserRenderersConfigurable.java | 4 ---- .../facet/impl/ui/FacetEditorImpl.java | 2 +- .../DefaultFacetSettingsConfigurable.java | 6 +----- .../impl/ui/facetType/FacetTypeEditor.java | 6 +----- .../openapi/projectRoots/ui/SdkEditor.java | 4 ---- .../ui/configuration/AnnotationsEditor.java | 4 ---- .../ui/configuration/BuildElementsEditor.java | 4 ---- .../ui/configuration/ClasspathEditor.java | 4 ---- .../roots/ui/configuration/JavadocEditor.java | 4 ---- .../ModuleConfigurableWrapper.java | 4 ---- .../roots/ui/configuration/OutputEditor.java | 4 ---- .../ui/configuration/ProjectConfigurable.java | 2 +- .../ProjectJdksConfigurable.java | 6 ------ .../ProjectStructureConfigurable.java | 6 ------ .../ui/configuration/TabbedModuleEditor.java | 2 +- .../artifacts/ArtifactConfigurableBase.java | 2 +- .../ArtifactsStructureConfigurable.java | 4 ---- .../AnalyzeDependenciesComponent.java | 20 +------------------ .../projectRoot/FacetConfigurable.java | 2 +- .../FacetStructureConfigurable.java | 4 ---- .../projectRoot/FacetTypeConfigurable.java | 10 +++------- .../FrameworkDetectionConfigurable.java | 5 ----- .../GlobalLibrariesConfigurable.java | 10 +--------- .../projectRoot/JdkConfigurable.java | 2 +- .../projectRoot/JdkListConfigurable.java | 6 ------ .../projectRoot/LibraryConfigurable.java | 2 +- .../projectRoot/ModuleConfigurable.java | 4 ---- .../ModuleStructureConfigurable.java | 4 ---- .../ProjectLibrariesConfigurable.java | 8 -------- .../ProjectStructureElementConfigurable.java | 6 ++++++ .../projectRoot/TextConfigurable.java | 4 ---- .../CodeStyleGenerationConfigurable.java | 6 ------ .../options/CodeStyleImportsConfigurable.java | 5 ----- .../options/JavadocFormatConfigurable.java | 9 +-------- .../options/JavadocOptionsProvider.java | 5 ----- .../intellij/javadoc/JavadocConfigurable.java | 4 ---- .../RunConfigurationConfigurableAdapter.java | 8 +------- .../com/intellij/facet/ui/FacetEditorTab.java | 5 ----- .../options/CodeCompletionOptions.java | 6 ------ .../CodeStyleAbstractConfigurable.java | 5 ----- .../options/CodeStyleSchemesConfigurable.java | 11 ---------- .../GeneralCodeStyleSettingsProvider.java | 8 -------- .../options/OtherTabsAndIndentsProvider.java | 8 -------- .../CodeStyleBlankLinesConfigurable.java | 10 +--------- .../CodeStyleSpacesConfigurable.java | 10 +--------- .../WrappingAndBracesSettingsProvider.java | 9 +-------- .../options/colors/ColorAndFontOptions.java | 11 ---------- .../editor/AutoImportOptionsConfigurable.java | 5 ----- .../editor/CodeFoldingConfigurable.java | 5 ----- .../editor/EditorAppearanceConfigurable.java | 5 ----- .../options/editor/EditorOptions.java | 6 ------ .../options/editor/EditorOptionsPanel.java | 5 ----- .../editor/EditorSmartKeysConfigurable.java | 5 ----- .../editor/EditorTabsConfigurable.java | 5 ----- .../config/IntentionSettingsConfigurable.java | 5 ----- .../impl/LiveTemplatesConfigurable.java | 5 ----- .../console/ConsoleFoldingConfigurable.java | 4 ---- .../execution/impl/RunConfigurable.java | 4 ---- .../impl/SingleConfigurationConfigurable.java | 4 ---- .../execution/impl/TemplateConfigurable.java | 6 ------ .../DetectionExcludesConfigurable.java | 5 ----- .../impl/AllFileTemplatesConfigurable.java | 4 ---- .../impl/FileTemplateConfigurable.java | 4 ---- .../todo/configurable/TodoConfigurable.java | 5 ----- .../ScopeChooserConfigurable.java | 4 ---- .../util/scopeChooser/ScopeConfigurable.java | 4 ---- .../CustomFoldingConfigurable.java | 5 ----- .../exclude/ui/ExcludedFilesConfigurable.java | 5 ----- .../fileTypes/impl/FileTypeConfigurable.java | 5 ----- .../CommonContentEntriesEditor.java | 4 ---- .../PlatformContentEntriesConfigurable.java | 4 ---- .../encoding/FileEncodingConfigurable.java | 6 ------ .../ui/DependencyConfigurable.java | 4 ---- .../ui/InspectionToolsConfigurable.java | 4 ---- .../TemplateDataLanguageConfigurable.java | 9 --------- .../com/intellij/tools/ToolConfigurable.java | 4 ---- .../ui/tabs/FileColorsConfigurable.java | 4 ---- .../openapi/options/Configurable.java | 10 ---------- .../openapi/ui/MasterDetailsComponent.java | 5 ----- .../openapi/ui/NamedConfigurable.java | 5 ++--- .../openapi/ui/NamedItemsListEditor.java | 9 +-------- .../util/net/HTTPProxySettingsPanel.java | 6 +----- .../pathMacros/PathMacroConfigurable.java | 4 ---- .../src/com/intellij/ide/BrowserSettings.java | 4 ---- .../ide/GeneralSettingsConfigurable.java | 5 ----- .../actionMacro/ActionMacroConfigurable.java | 4 ---- .../config/PasswordSafeConfigurable.java | 7 ------- .../ide/plugins/PluginHostsConfigurable.java | 4 ---- .../plugins/PluginManagerConfigurable.java | 5 ----- .../ide/ui/AppearanceConfigurable.java | 5 ----- .../CustomizationConfigurable.java | 5 ----- .../search/DefaultSearchableConfigurable.java | 4 ---- .../configurable/StatisticsConfigurable.java | 6 ------ .../impl/NotificationsConfigurable.java | 4 ---- .../diff/impl/external/DiffOptionsForm.java | 4 ---- .../keymap/impl/ui/KeymapConfigurable.java | 4 ---- .../openapi/keymap/impl/ui/KeymapPanel.java | 4 ---- .../keymap/impl/ui/QuickListsPanel.java | 4 ---- .../openapi/options/TabbedConfigurable.java | 2 +- .../options/newEditor/OptionsEditor.java | 4 ---- .../impl/UndefinedMacrosConfigurable.java | 4 ---- .../impl/UpdateSettingsConfigurable.java | 5 ----- .../PlatformFileEncodingConfigurable.java | 5 ----- .../ui/switcher/QuickAccessConfigurable.java | 4 ---- .../changes/committed/CacheSettingsPanel.java | 6 +----- .../ChangelistConflictConfigurable.java | 4 ---- .../vcs/changes/ui/IgnoredSettingsPanel.java | 4 ---- .../IssueNavigationConfigurationPanel.java | 4 ---- ...ackgroundOperationsConfigurationPanel.java | 6 +----- .../configurable/VcsConfigurationsDialog.java | 4 ---- .../VcsContentAnnotationConfigurable.java | 5 ----- .../VcsDirectoryConfigurationPanel.java | 4 ---- .../VcsGeneralConfigurationPanel.java | 4 ---- .../configurable/VcsManagerConfigurable.java | 8 -------- .../impl/settings/DebuggerConfigurable.java | 5 ----- .../intelliLang/AdvancedSettingsUI.java | 4 ---- .../MethodParameterInjectionConfigurable.java | 7 ------- .../intelliLang/InjectionsSettingsUI.java | 4 ---- .../XmlAttributeInjectionConfigurable.java | 7 ------- .../XmlTagInjectionConfigurable.java | 7 ------- .../AndroidDexCompilerSettingsFactory.java | 6 ------ .../copyright/ui/CopyrightConfigurable.java | 5 ----- .../ui/CopyrightFormattingConfigurable.java | 4 ---- .../copyright/ui/CopyrightProfilesPanel.java | 7 +------ .../ui/CopyrightProjectConfigurable.java | 4 ---- .../copyright/ui/TemplateCommentPanel.java | 4 ---- .../cvsSupport2/Cvs2Configurable.java | 5 ----- .../cvsSupport2/UpdateConfigurable.java | 6 +----- .../build/PluginModuleBuildConfEditor.java | 5 ----- .../GenerateToStringActionHandlerImpl.java | 6 +----- .../GenerateToStringConfigurable.java | 9 --------- .../tostring/view/TemplatesPanel.java | 10 ++-------- .../git4idea/config/GitVcsConfigurable.java | 6 ------ .../update/GitUpdateConfigurable.java | 7 ------- .../github/ui/GitHubSettingsConfigurable.java | 5 ----- .../gradle/config/GradleConfigurable.java | 7 +------ .../compiler/GroovyCompilerConfigurable.java | 5 ----- .../GroovyDebuggerSettingsConfigurable.java | 5 ----- .../plugins/groovy/gant/GantConfigurable.java | 6 ------ .../zmlx/hg4idea/HgProjectConfigurable.java | 4 ---- .../provider/update/HgUpdateEnvironment.java | 4 ---- .../zmlx/hg4idea/ui/HgIntegrateDialog.java | 6 +----- .../execution/CompositeConfigurable.java | 7 +------ .../execution/MavenRunnerConfigurable.java | 5 ----- .../MavenRunnerParametersConfigurable.java | 10 ++++------ .../MavenRepositoriesConfigurable.java | 4 ---- .../project/MavenGeneralConfigurable.java | 7 +------ .../MavenIgnoredFilesConfigurable.java | 5 ----- .../project/MavenImportingConfigurable.java | 5 ----- .../idea/maven/utils/MavenSettings.java | 5 ----- .../maven/wizards/MavenProjectImportStep.java | 5 ----- .../src/com/wrq/rearranger/Rearranger.java | 5 ----- .../settings/SpellCheckerSettingsManager.java | 7 +------ .../jetbrains/idea/svn/SvnConfigurable.java | 4 ---- .../idea/svn/config/GroupConfigurable.java | 4 ---- .../config/SvnConfigureProxiesComponent.java | 4 ---- .../svn/history/SvnMergeSourceDetails.java | 8 -------- .../svn/update/SvnUpdateConfigurable.java | 4 ---- .../tasks/config/TaskConfigurable.java | 4 ---- .../config/TaskRepositoriesConfigurable.java | 4 ---- .../uiDesigner/GuiDesignerConfigurable.java | 4 ---- .../impl/FileAssociationsConfigurable.java | 8 +------- .../lang/xpath/xslt/impl/XsltConfigImpl.java | 9 ++------- .../plugins/xpathView/XPathConfigurable.java | 7 +------ .../HtmlCodeStyleSettingsProvider.java | 8 +------- .../options/XmlCodeStyleSettingsProvider.java | 12 +++-------- .../editor/WebEditorOptionsProvider.java | 4 ---- .../chrome/ChromeSettingsConfigurable.java | 5 ----- .../firefox/FirefoxSettingsConfigurable.java | 6 +----- .../javaee/ExternalResourceConfigurable.java | 5 ----- 186 files changed, 58 insertions(+), 947 deletions(-) diff --git a/images/src/org/intellij/images/options/impl/OptionsConfigurabe.java b/images/src/org/intellij/images/options/impl/OptionsConfigurabe.java index f885805fc8d1..0be6b07a81cd 100644 --- a/images/src/org/intellij/images/options/impl/OptionsConfigurabe.java +++ b/images/src/org/intellij/images/options/impl/OptionsConfigurabe.java @@ -19,7 +19,6 @@ import com.intellij.openapi.options.BaseConfigurableWithChangeSupport; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import org.intellij.images.ImagesBundle; import org.intellij.images.options.Options; import org.intellij.images.options.OptionsManager; @@ -44,11 +43,7 @@ public final class OptionsConfigurabe extends BaseConfigurableWithChangeSupport return DISPLAY_NAME; } - public Icon getIcon() { - return IconLoader.getIcon("/org/intellij/images/icons/ImagesConfigurable.png"); - } - - public String getHelpTopic() { + public String getHelpTopic() { return "preferences.images"; } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.java index bcf153ac20a4..bfa4e4bf5f4a 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.java @@ -47,10 +47,6 @@ public class EclipseCompilerConfigurable implements Configurable { return null; } - public Icon getIcon() { - return null; - } - @Nullable @NonNls public String getHelpTopic() { diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfigurable.java index 0706f93d2af6..483ab3316219 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfigurable.java @@ -45,10 +45,6 @@ public class JavacConfigurable implements Configurable{ return null; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return null; } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesConfigurable.java index a7cd8a4d1f82..f17a11997c58 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesConfigurable.java @@ -62,10 +62,6 @@ public class JikesConfigurable implements Configurable { return null; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return null; } diff --git a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java index dfb452cbd5d5..34e7e50ec71c 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java @@ -47,10 +47,6 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable, return "Annotation Processors"; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "reference.projectsettings.compiler.annotationProcessors"; } diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java index 136cbe8fc5b7..1463218d120f 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java @@ -60,10 +60,6 @@ public class CompilerConfigurable implements SearchableConfigurable.Parent, Conf return CompilerBundle.message("compiler.configurable.display.name"); } - public Icon getIcon() { - return ICON; - } - public String getHelpTopic() { return "project.propCompiler"; } @@ -165,10 +161,6 @@ public class CompilerConfigurable implements SearchableConfigurable.Parent, Conf return "Excludes"; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "reference.projectsettings.compiler.excludes"; } diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java index 96d884fe0cc0..8e609ec90a69 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java @@ -178,10 +178,6 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura return "General"; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return null; } diff --git a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java index a6d5ff120754..55f97f2fed7e 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java @@ -94,10 +94,6 @@ public class JavaCompilersTab implements SearchableConfigurable, Configurable.No return CompilerBundle.message("java.compiler.description"); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "reference.projectsettings.compiler.javacompiler"; } diff --git a/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java index c235bcb343f9..95adcdf44cbd 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java @@ -63,10 +63,6 @@ public class RmicConfigurable implements SearchableConfigurable, Configurable.No return CompilerBundle.message("rmi.compiler.description"); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "reference.projectsettings.compiler.rmicompiler"; } diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/AdjustArrayRangeAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/AdjustArrayRangeAction.java index 5f905ddc4784..bb74b8eccc45 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/AdjustArrayRangeAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/AdjustArrayRangeAction.java @@ -23,7 +23,6 @@ import com.intellij.debugger.ui.impl.watch.DebuggerTreeNodeImpl; import com.intellij.debugger.ui.impl.watch.NodeDescriptorImpl; import com.intellij.debugger.ui.impl.watch.ValueDescriptorImpl; import com.intellij.debugger.ui.tree.render.*; -import com.intellij.debugger.ui.tree.render.Renderer; import com.intellij.ide.actions.ShowSettingsUtilImpl; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.options.Configurable; @@ -32,8 +31,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import org.jetbrains.annotations.Nullable; -import javax.swing.*; - public class AdjustArrayRangeAction extends DebuggerAction { public void actionPerformed(AnActionEvent e) { DebuggerContextImpl debuggerContext = DebuggerAction.getDebuggerContext(e.getDataContext()); @@ -146,10 +143,6 @@ public class AdjustArrayRangeAction extends DebuggerAction { return myTitle; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return null; } diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeContextViewAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeContextViewAction.java index 7a03251dcea4..4be77763f912 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeContextViewAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeContextViewAction.java @@ -33,7 +33,6 @@ import com.intellij.openapi.options.ex.SingleConfigurableEditor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; -import javax.swing.*; import java.util.ArrayList; import java.util.List; @@ -64,10 +63,6 @@ public class CustomizeContextViewAction extends DebuggerAction{ return DebuggerBundle.message("title.customize.data.views"); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return null; } diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java index 367975ff2d35..0880b94f337f 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java @@ -176,10 +176,6 @@ public class DebuggerDataViewsConfigurable implements SearchableConfigurable { return panel; } - public Icon getIcon() { - return null; - } - public void apply() { final ViewsGeneralSettings generalSettings = ViewsGeneralSettings.getInstance(); final NodeRendererSettings rendererSettings = NodeRendererSettings.getInstance(); diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerHotswapConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerHotswapConfigurable.java index 6e067fdce449..a70be30556e2 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerHotswapConfigurable.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerHotswapConfigurable.java @@ -79,10 +79,6 @@ public class DebuggerHotswapConfigurable implements SearchableConfigurable { return DebuggerBundle.message("debugger.hotswap.configurable.display.name"); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "reference.idesettings.debugger.hotswap"; } @@ -139,4 +135,4 @@ public class DebuggerHotswapConfigurable implements SearchableConfigurable { public void disposeUIResources() { } -} \ No newline at end of file +} diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerLaunchingConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerLaunchingConfigurable.java index 7937d28c2232..f731c8943dec 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerLaunchingConfigurable.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerLaunchingConfigurable.java @@ -24,7 +24,6 @@ import com.intellij.ui.components.panels.VerticalBox; import javax.swing.*; import javax.swing.border.Border; -import javax.swing.border.EmptyBorder; import java.awt.*; public class DebuggerLaunchingConfigurable implements Configurable{ @@ -84,10 +83,6 @@ public class DebuggerLaunchingConfigurable implements Configurable{ return DebuggerBundle.message("debugger.launching.configurable.display.name"); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "reference.idesettings.debugger.launching"; } diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java index 9d4a79051067..d85e6368ed1b 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java @@ -78,10 +78,6 @@ public class DebuggerSteppingConfigurable implements SearchableConfigurable, Con return DebuggerBundle.message("debugger.stepping.configurable.display.name"); } - public Icon getIcon() { - return null; - } - @NotNull public String getHelpTopic() { return "reference.idesettings.debugger.stepping"; @@ -126,4 +122,4 @@ public class DebuggerSteppingConfigurable implements SearchableConfigurable, Con myProject = null; } -} \ No newline at end of file +} diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewConfigurable.java index 6c7d74c06db0..1015542bd3f7 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewConfigurable.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewConfigurable.java @@ -58,10 +58,6 @@ public class ThreadsViewConfigurable extends BaseConfigurable { return myPanel; } - public Icon getIcon() { - return null; - } - public void apply() { myDataBinding.saveData(mySettings); final Project[] openProjects = ProjectManager.getInstance().getOpenProjects(); diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/UserRenderersConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/UserRenderersConfigurable.java index 0e14b2aad2c9..ca14fa447112 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/UserRenderersConfigurable.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/UserRenderersConfigurable.java @@ -64,10 +64,6 @@ public class UserRenderersConfigurable implements SearchableConfigurable, Config return DebuggerBundle.message("user.renderers.configurable.display.name"); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "reference.idesettings.debugger.typerenderers"; } diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorImpl.java b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorImpl.java index de8bbb9f157a..9edd3af6ff5d 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorImpl.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorImpl.java @@ -82,7 +82,7 @@ public class FacetEditorImpl extends UnnamedConfigurableGroup implements Unnamed if (c != null) { UIUtil.addInsets(c, UIUtil.PANEL_SMALL_INSETS); } - tabbedPane.addTab(editorTab.getDisplayName(), editorTab.getIcon(), c, null); + tabbedPane.addTab(editorTab.getDisplayName(), c); } tabbedPane.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/DefaultFacetSettingsConfigurable.java b/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/DefaultFacetSettingsConfigurable.java index 3a0ee927d31f..f9dbe68061c1 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/DefaultFacetSettingsConfigurable.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/DefaultFacetSettingsConfigurable.java @@ -21,8 +21,8 @@ import com.intellij.facet.ProjectFacetManager; import com.intellij.facet.ui.DefaultFacetSettingsEditor; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; -import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.project.Project; +import com.intellij.openapi.project.ProjectBundle; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -48,10 +48,6 @@ public class DefaultFacetSettingsConfigurable impl return ProjectBundle.message("facet.defaults.display.name"); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return myDelegate.getHelpTopic(); } diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetTypeEditor.java b/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetTypeEditor.java index df2f63b2a204..fcae653df295 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetTypeEditor.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetTypeEditor.java @@ -121,7 +121,7 @@ public class FacetTypeEditor extends UnnamedConfigurableGroup { myTabbedPane = new TabbedPaneWrapper(myDisposable); for (Configurable configurable : myCurrentConfigurables) { - myTabbedPane.addTab(configurable.getDisplayName(), configurable.getIcon(), configurable.createComponent(), null); + myTabbedPane.addTab(configurable.getDisplayName(), configurable.createComponent()); } return myTabbedPane.getComponent(); } @@ -146,10 +146,6 @@ public class FacetTypeEditor extends UnnamedConfigurableGroup { return ProjectBundle.message("tab.name.all.facets"); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return myEditor.getHelpTopic(); } diff --git a/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java index e35597ae35d7..521a2ef5e041 100644 --- a/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java @@ -112,10 +112,6 @@ public class SdkEditor implements Configurable, Place.Navigator { return ProjectBundle.message("sdk.configure.editor.title"); } - public Icon getIcon(){ - return null; - } - public String getHelpTopic(){ return null; } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java index 0ec251b33936..604c703d930f 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java @@ -58,10 +58,6 @@ public class AnnotationsEditor extends ModuleElementsEditor { return NAME; } - public Icon getIcon() { - return ICON; - } - public void saveData() { TableUtil.stopEditing(myTable); final int count = myTable.getRowCount(); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java index 6de8a78ec9ef..1add516bb474 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java @@ -232,10 +232,6 @@ public class BuildElementsEditor extends ModuleElementsEditor { return ProjectBundle.message("output.tab.title"); } - public Icon getIcon() { - return ICON; - } - @Nullable @NonNls public String getHelpTopic() { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java index 402317101fa6..0c85f1056a9c 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java @@ -72,10 +72,6 @@ public class ClasspathEditor extends ModuleElementsEditor implements ModuleRootL return NAME; } - public Icon getIcon() { - return ICON; - } - public void saveData() { myPanel.stopEditing(); flushChangesToModel(); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java index e88a023751ab..480851327017 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java @@ -61,10 +61,6 @@ public class JavadocEditor extends ModuleElementsEditor { return NAME; } - public Icon getIcon() { - return ICON; - } - public void saveData() { TableUtil.stopEditing(myTable); final int count = myTable.getRowCount(); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurableWrapper.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurableWrapper.java index 8d8f68be7085..63c700ea9e58 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurableWrapper.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurableWrapper.java @@ -42,10 +42,6 @@ class ModuleConfigurableWrapper implements ModuleConfigurationEditor { return myModuleConfigurable.getDisplayName(); } - public Icon getIcon() { - return myModuleConfigurable.getIcon(); - } - public String getHelpTopic() { return myModuleConfigurable.getHelpTopic(); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/OutputEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/OutputEditor.java index 4872f9d1996f..3c34ae82a548 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/OutputEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/OutputEditor.java @@ -70,10 +70,6 @@ public class OutputEditor extends ModuleElementsEditor { return ProjectBundle.message("project.roots.path.tab.title"); } - public Icon getIcon() { - return myCompilerOutputEditor.getIcon(); - } - public void moduleStateChanged() { super.moduleStateChanged(); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java index 12a9d25524a1..e654773f7854 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java @@ -245,7 +245,7 @@ public class ProjectConfigurable extends ProjectStructureElementConfigurable { return myFacetType.getPresentableName(); } - public Icon getIcon() { - return myFacetType.getIcon(); - } - public String getHelpTopic() { final FacetTypeEditor editor = myFacetStructureConfigurable.getFacetTypeEditor(myFacetType); return editor != null ? editor.getHelpTopic() : null; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FrameworkDetectionConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FrameworkDetectionConfigurable.java index fc183b7eb9ec..edb6a89f4053 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FrameworkDetectionConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FrameworkDetectionConfigurable.java @@ -63,11 +63,6 @@ public class FrameworkDetectionConfigurable extends NamedConfigurable im return myProjectJdk.getName(); } - public Icon getIcon() { + public Icon getIcon(boolean open) { return ((SdkType) myProjectJdk.getSdkType()).getIcon(); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java index 514d710e5a0a..e16f7fe4605b 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java @@ -37,7 +37,6 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.swing.*; import javax.swing.tree.TreePath; import java.util.ArrayList; import java.util.Collection; @@ -95,11 +94,6 @@ public class JdkListConfigurable extends BaseStructureConfigurable { return "SDKs"; } - @Nullable - public Icon getIcon() { - return null; - } - @Nullable @NonNls public String getHelpTopic() { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryConfigurable.java index 26fb597ffa32..09ef545031b0 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryConfigurable.java @@ -166,7 +166,7 @@ public class LibraryConfigurable extends ProjectStructureElementConfigurable extends NamedConfig @Nullable public abstract ProjectStructureElement getProjectStructureElement(); + @Nullable + public Icon getIcon(boolean open) { + return null; + } } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/TextConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/TextConfigurable.java index f6c08deb3de2..d63c7e1d9db3 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/TextConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/TextConfigurable.java @@ -85,10 +85,6 @@ public class TextConfigurable extends NamedConfigurable { return myDisplayName; } - public Icon getIcon() { - return myOpenedIcon; - } - public Icon getIcon(final boolean open) { return open ? myOpenedIcon : myClosedIcon; } diff --git a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java index 297f0b9f1d36..44ccf4985b95 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java @@ -17,7 +17,6 @@ package com.intellij.application.options; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.openapi.application.ApplicationBundle; -import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; @@ -81,11 +80,6 @@ public class CodeStyleGenerationConfigurable implements Configurable { return "reference.settingsdialog.IDE.globalcodestyle.codegen"; } - public Icon getIcon() { - return StdFileTypes.JAVA.getIcon(); - } - - /*private JPanel createNamingPanel() { OptionGroup optionGroup = new OptionGroup("Naming"); diff --git a/java/java-impl/src/com/intellij/application/options/CodeStyleImportsConfigurable.java b/java/java-impl/src/com/intellij/application/options/CodeStyleImportsConfigurable.java index 97fb1cde6b48..a18a1080f980 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleImportsConfigurable.java +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleImportsConfigurable.java @@ -16,7 +16,6 @@ package com.intellij.application.options; import com.intellij.openapi.application.ApplicationBundle; -import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.options.BaseConfigurable; import com.intellij.psi.codeStyle.CodeStyleSettings; @@ -43,10 +42,6 @@ public class CodeStyleImportsConfigurable extends BaseConfigurable { return ApplicationBundle.message("title.imports"); } - public Icon getIcon() { - return StdFileTypes.JAVA.getIcon(); - } - public void reset() { if (myPanel != null) { myPanel.reset(); diff --git a/java/java-impl/src/com/intellij/application/options/JavadocFormatConfigurable.java b/java/java-impl/src/com/intellij/application/options/JavadocFormatConfigurable.java index 3742b93ce3e4..8c8d4eb9dce6 100644 --- a/java/java-impl/src/com/intellij/application/options/JavadocFormatConfigurable.java +++ b/java/java-impl/src/com/intellij/application/options/JavadocFormatConfigurable.java @@ -15,12 +15,9 @@ */ package com.intellij.application.options; -import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.psi.codeStyle.CodeStyleSettings; -import javax.swing.*; - public class JavadocFormatConfigurable extends CodeStyleAbstractConfigurable { public JavadocFormatConfigurable(CodeStyleSettings settings, CodeStyleSettings cloneSettings) { super(settings, cloneSettings, ApplicationBundle.message("title.javadoc")); @@ -30,11 +27,7 @@ public class JavadocFormatConfigurable extends CodeStyleAbstractConfigurable { return new JavaDocFormattingPanel(settings); } - public Icon getIcon() { - return StdFileTypes.JAVA.getIcon(); - } - public String getHelpTopic() { return "reference.settingsdialog.IDE.globalcodestyle.javadoc"; } -} \ No newline at end of file +} diff --git a/java/java-impl/src/com/intellij/application/options/JavadocOptionsProvider.java b/java/java-impl/src/com/intellij/application/options/JavadocOptionsProvider.java index e45728ad8a83..5debc461471a 100644 --- a/java/java-impl/src/com/intellij/application/options/JavadocOptionsProvider.java +++ b/java/java-impl/src/com/intellij/application/options/JavadocOptionsProvider.java @@ -50,11 +50,6 @@ public class JavadocOptionsProvider implements EditorOptionsProvider { return JavadocBundle.message("javadoc.generate.message.title"); } - @Override - public Icon getIcon() { - return null; - } - @Override public String getHelpTopic() { return null; diff --git a/java/java-impl/src/com/intellij/javadoc/JavadocConfigurable.java b/java/java-impl/src/com/intellij/javadoc/JavadocConfigurable.java index cafff6e5ccbf..e74ad4a54fe0 100644 --- a/java/java-impl/src/com/intellij/javadoc/JavadocConfigurable.java +++ b/java/java-impl/src/com/intellij/javadoc/JavadocConfigurable.java @@ -146,10 +146,6 @@ public final class JavadocConfigurable implements Configurable { return null; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "project.propJavaDoc"; } diff --git a/platform/lang-api/src/com/intellij/execution/RunConfigurationConfigurableAdapter.java b/platform/lang-api/src/com/intellij/execution/RunConfigurationConfigurableAdapter.java index 974cbc590ed6..2eefd239cc25 100644 --- a/platform/lang-api/src/com/intellij/execution/RunConfigurationConfigurableAdapter.java +++ b/platform/lang-api/src/com/intellij/execution/RunConfigurationConfigurableAdapter.java @@ -19,8 +19,6 @@ import com.intellij.execution.configurations.RunConfiguration; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.options.SettingsEditorConfigurable; -import javax.swing.*; - public class RunConfigurationConfigurableAdapter extends SettingsEditorConfigurable{ public RunConfigurationConfigurableAdapter(SettingsEditor settingsEditor, T configuration) { super(settingsEditor, configuration); @@ -30,10 +28,6 @@ public class RunConfigurationConfigurableAdapter ex return getSettings().getName(); } - public Icon getIcon() { - return getSettings().getType().getIcon(); - } - public String getHelpTopic() { return null; } @@ -41,4 +35,4 @@ public class RunConfigurationConfigurableAdapter ex public T getConfiguration() { return getSettings(); } -} \ No newline at end of file +} diff --git a/platform/lang-api/src/com/intellij/facet/ui/FacetEditorTab.java b/platform/lang-api/src/com/intellij/facet/ui/FacetEditorTab.java index 2c61b9165831..322c995a98cd 100644 --- a/platform/lang-api/src/com/intellij/facet/ui/FacetEditorTab.java +++ b/platform/lang-api/src/com/intellij/facet/ui/FacetEditorTab.java @@ -32,11 +32,6 @@ import javax.swing.*; */ public abstract class FacetEditorTab implements Configurable { - @Nullable - public Icon getIcon() { - return null; - } - @Nullable @NonNls public String getHelpTopic() { diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java index b5785c75f821..1840121e86ab 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java @@ -17,7 +17,6 @@ package com.intellij.application.options; import com.intellij.application.options.editor.EditorOptionsProvider; -import com.intellij.icons.AllIcons; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.options.BaseConfigurable; import com.intellij.openapi.options.Configurable; @@ -46,11 +45,6 @@ public class CodeCompletionOptions extends BaseConfigurable implements Searchabl return ApplicationBundle.message("title.code.completion"); } - @Override - public Icon getIcon() { - return AllIcons.General.ConfigurableCodeCompletion; - } - @Override public void reset() { myPanel.reset(); diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractConfigurable.java index 04a2329b6568..793790b0c7bd 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractConfigurable.java @@ -44,11 +44,6 @@ public abstract class CodeStyleAbstractConfigurable implements Configurable, Opt return myDisplayName; } - @Override - public Icon getIcon() { - return null; - } - @Override public JComponent createComponent() { myPanel = createPanel(myCloneSettings); diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java index a77c2ba6d0d9..68afeee035c0 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java @@ -17,7 +17,6 @@ package com.intellij.application.options; import com.intellij.application.options.codeStyle.*; -import com.intellij.icons.AllIcons; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.options.Configurable; @@ -278,11 +277,6 @@ public class CodeStyleSchemesConfigurable extends SearchableConfigurable.Parent. return "Code Style"; } - @Override - public Icon getIcon() { - return AllIcons.General.ConfigurableCodeStyle; - } - @Override public String getHelpTopic() { return "reference.settingsdialog.IDE.globalcodestyle"; @@ -343,11 +337,6 @@ public class CodeStyleSchemesConfigurable extends SearchableConfigurable.Parent. return ensurePanel().getDisplayName(); // fallback for 8.0 API compatibility } - @Override - public Icon getIcon() { - return null; - } - @Override public String getHelpTopic() { return ensurePanel().getHelpTopic(); diff --git a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStyleSettingsProvider.java b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStyleSettingsProvider.java index 5a570fda9cb5..e6aa19a9d572 100644 --- a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStyleSettingsProvider.java +++ b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStyleSettingsProvider.java @@ -17,15 +17,12 @@ package com.intellij.application.options; import com.intellij.openapi.application.ApplicationBundle; -import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.options.Configurable; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsProvider; import com.intellij.psi.codeStyle.DisplayPriority; import org.jetbrains.annotations.NotNull; -import javax.swing.*; - /** * @author yole */ @@ -39,11 +36,6 @@ public class GeneralCodeStyleSettingsProvider extends CodeStyleSettingsProvider return new GeneralCodeStylePanel(settings); } - @Override - public Icon getIcon() { - return FileTypes.PLAIN_TEXT.getIcon(); - } - @Override public String getHelpTopic() { return "reference.settingsdialog.IDE.globalcodestyle.general"; diff --git a/platform/lang-impl/src/com/intellij/application/options/OtherTabsAndIndentsProvider.java b/platform/lang-impl/src/com/intellij/application/options/OtherTabsAndIndentsProvider.java index fc2ad4608b06..ea6c06d37796 100644 --- a/platform/lang-impl/src/com/intellij/application/options/OtherTabsAndIndentsProvider.java +++ b/platform/lang-impl/src/com/intellij/application/options/OtherTabsAndIndentsProvider.java @@ -18,7 +18,6 @@ package com.intellij.application.options; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.extensions.Extensions; -import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.options.Configurable; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsProvider; @@ -26,8 +25,6 @@ import com.intellij.psi.codeStyle.DisplayPriority; import com.intellij.psi.codeStyle.FileTypeIndentOptionsProvider; import org.jetbrains.annotations.NotNull; -import javax.swing.*; - /** * @author yole */ @@ -41,11 +38,6 @@ public class OtherTabsAndIndentsProvider extends CodeStyleSettingsProvider { return new OtherTabsAndIndentsPanel(settings); } - @Override - public Icon getIcon() { - return FileTypes.PLAIN_TEXT.getIcon(); - } - @Override public String getHelpTopic() { return "reference.settingsdialog.IDE.globalcodestyle.general"; diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesConfigurable.java index adc5d8448ac3..9470275c2859 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesConfigurable.java @@ -18,11 +18,8 @@ package com.intellij.application.options.codeStyle; import com.intellij.application.options.CodeStyleAbstractConfigurable; import com.intellij.application.options.CodeStyleAbstractPanel; import com.intellij.openapi.application.ApplicationBundle; -import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.psi.codeStyle.CodeStyleSettings; -import javax.swing.*; - public class CodeStyleBlankLinesConfigurable extends CodeStyleAbstractConfigurable { public CodeStyleBlankLinesConfigurable(CodeStyleSettings settings, CodeStyleSettings cloneSettings) { super(settings, cloneSettings, ApplicationBundle.message("title.blank.lines")); @@ -33,13 +30,8 @@ public class CodeStyleBlankLinesConfigurable extends CodeStyleAbstractConfigurab return new CodeStyleBlankLinesPanel(settings); } - @Override - public Icon getIcon() { - return StdFileTypes.JAVA.getIcon(); - } - @Override public String getHelpTopic() { return "reference.settingsdialog.IDE.globalcodestyle.blanklines"; } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesConfigurable.java index c588fc901993..a147d622c261 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesConfigurable.java @@ -18,21 +18,13 @@ package com.intellij.application.options.codeStyle; import com.intellij.application.options.CodeStyleAbstractConfigurable; import com.intellij.application.options.CodeStyleAbstractPanel; import com.intellij.openapi.application.ApplicationBundle; -import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.psi.codeStyle.CodeStyleSettings; -import javax.swing.*; - public class CodeStyleSpacesConfigurable extends CodeStyleAbstractConfigurable { public CodeStyleSpacesConfigurable(CodeStyleSettings settings, CodeStyleSettings cloneSettings) { super(settings, cloneSettings, ApplicationBundle.message("title.spaces")); } - @Override - public Icon getIcon() { - return StdFileTypes.JAVA.getIcon(); - } - @Override protected CodeStyleAbstractPanel createPanel(final CodeStyleSettings settings) { return new CodeStyleSpacesPanel(settings); @@ -42,4 +34,4 @@ public class CodeStyleSpacesConfigurable extends CodeStyleAbstractConfigurable { public String getHelpTopic() { return "reference.settingsdialog.IDE.globalcodestyle.spaces"; } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesSettingsProvider.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesSettingsProvider.java index d55cad8b5d68..6987245de46e 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesSettingsProvider.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesSettingsProvider.java @@ -18,7 +18,6 @@ package com.intellij.application.options.codeStyle; import com.intellij.application.options.CodeStyleAbstractConfigurable; import com.intellij.application.options.CodeStyleAbstractPanel; import com.intellij.openapi.application.ApplicationBundle; -import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.options.Configurable; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsProvider; @@ -26,17 +25,11 @@ import com.intellij.psi.codeStyle.DisplayPriority; import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; import org.jetbrains.annotations.NotNull; -import javax.swing.*; - public class WrappingAndBracesSettingsProvider extends CodeStyleSettingsProvider { @Override @NotNull public Configurable createSettingsPage(final CodeStyleSettings settings, final CodeStyleSettings originalSettings) { return new CodeStyleAbstractConfigurable(settings, originalSettings, ApplicationBundle.message("wrapping.and.braces")) { - @Override - public Icon getIcon() { - return StdFileTypes.JAVA.getIcon(); - } @Override protected CodeStyleAbstractPanel createPanel(final CodeStyleSettings settings) { @@ -64,4 +57,4 @@ public class WrappingAndBracesSettingsProvider extends CodeStyleSettingsProvider public DisplayPriority getPriority() { return DisplayPriority.COMMON_SETTINGS; } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java index 852c7d53754d..b0459f9e3ef7 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java @@ -21,7 +21,6 @@ import com.intellij.application.options.editor.EditorOptionsProvider; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl; import com.intellij.execution.impl.ConsoleViewUtil; -import com.intellij.icons.AllIcons; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.diagnostic.Logger; @@ -621,11 +620,6 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract return ApplicationBundle.message("title.colors.and.fonts"); } - @Override - public Icon getIcon() { - return AllIcons.General.ConfigurableColorsAndFonts; - } - private void revertChanges(){ if (isSchemeListModified() || isSomeSchemeModified()) { myRevertChangesCompleted = false; @@ -1210,11 +1204,6 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract return mySubPanel; } - @Override - public Icon getIcon() { - return null; - } - @Override public String getHelpTopic() { return null; diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java index dafc6479a9b9..467e51fc2a7f 100644 --- a/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java @@ -44,11 +44,6 @@ public class AutoImportOptionsConfigurable extends CompositeConfigurable { return myScope.getName(); } - public Icon getIcon() { - return myIcon; - } - public NamedScopesHolder getHolder() { return getHolder(mySharedCheckbox.isSelected()); } diff --git a/platform/lang-impl/src/com/intellij/lang/customFolding/CustomFoldingConfigurable.java b/platform/lang-impl/src/com/intellij/lang/customFolding/CustomFoldingConfigurable.java index b35737cc6153..4bbd1e1873f1 100644 --- a/platform/lang-impl/src/com/intellij/lang/customFolding/CustomFoldingConfigurable.java +++ b/platform/lang-impl/src/com/intellij/lang/customFolding/CustomFoldingConfigurable.java @@ -38,11 +38,6 @@ public class CustomFoldingConfigurable implements SearchableConfigurable { return "Custom Folding"; //TODO Move to resources } - @Override - public Icon getIcon() { - return null; - } - @Override public String getHelpTopic() { return null; //TODO: Define help topic diff --git a/platform/lang-impl/src/com/intellij/openapi/file/exclude/ui/ExcludedFilesConfigurable.java b/platform/lang-impl/src/com/intellij/openapi/file/exclude/ui/ExcludedFilesConfigurable.java index 2ffb6a7163f5..827a97c37b17 100644 --- a/platform/lang-impl/src/com/intellij/openapi/file/exclude/ui/ExcludedFilesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/openapi/file/exclude/ui/ExcludedFilesConfigurable.java @@ -58,11 +58,6 @@ public class ExcludedFilesConfigurable implements SearchableConfigurable { return "Excluded Files"; //TODO Move to resources } - @Override - public Icon getIcon() { - return null; - } - @Override public String getHelpTopic() { return null; diff --git a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java index 3c5d9d6b6b84..ae9e16de0c5f 100644 --- a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java +++ b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java @@ -19,7 +19,6 @@ package com.intellij.openapi.fileTypes.impl; import com.intellij.CommonBundle; import com.intellij.application.options.ExportSchemeAction; import com.intellij.application.options.SchemesToImportPopup; -import com.intellij.icons.AllIcons; import com.intellij.ide.highlighter.custom.SyntaxTable; import com.intellij.ide.highlighter.custom.impl.ReadFileType; import com.intellij.lang.Language; @@ -97,10 +96,6 @@ public class FileTypeConfigurable extends BaseConfigurable implements Searchable myRecognizedFileType.setFileTypes(types); } - public Icon getIcon() { - return AllIcons.General.ConfigurableFileTypes; - } - private static FileType[] getModifiableFileTypes() { FileType[] registeredFileTypes = FileTypeManager.getInstance().getRegisteredFileTypes(); ArrayList result = new ArrayList(); diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java index 56d3e45833e4..8f13118d4bbf 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java @@ -122,10 +122,6 @@ public class CommonContentEntriesEditor extends ModuleElementsEditor { return NAME; } - public Icon getIcon() { - return ICON; - } - public void disposeUIResources() { if (myRootTreeEditor != null) { myRootTreeEditor.setContentEntryEditor(null); diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/PlatformContentEntriesConfigurable.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/PlatformContentEntriesConfigurable.java index 1d38a7df7ac9..b818132f7974 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/PlatformContentEntriesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/PlatformContentEntriesConfigurable.java @@ -37,10 +37,6 @@ public class PlatformContentEntriesConfigurable implements Configurable { return "Project Structure"; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return null; } diff --git a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java index 07f8d6fe2cd1..6c6af149e325 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java +++ b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java @@ -16,7 +16,6 @@ package com.intellij.openapi.vfs.encoding; -import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; @@ -67,11 +66,6 @@ public class FileEncodingConfigurable implements SearchableConfigurable, Optiona return IdeBundle.message("file.encodings.configurable"); } - @Nullable - public Icon getIcon() { - return AllIcons.General.ConfigureEncoding; - } - @Nullable @NonNls public String getHelpTopic() { diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependencyConfigurable.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependencyConfigurable.java index 613d522bf0fd..c9659b2d017c 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependencyConfigurable.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependencyConfigurable.java @@ -68,10 +68,6 @@ public class DependencyConfigurable extends BaseConfigurable { return AnalysisScopeBundle.message("dependency.configurable.display.name"); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "editing.analyzeDependencies.validation"; } diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java index 6d3d8fad07af..5067129f78fb 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java @@ -255,10 +255,6 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable imple return DISPLAY_NAME; } - public Icon getIcon() { - return AllIcons.General.ConfigurableErrorHighlighting; - } - public String getHelpTopic() { return "preferences.inspections"; } diff --git a/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageConfigurable.java b/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageConfigurable.java index 9f993f6e9a4c..0db98442af21 100644 --- a/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageConfigurable.java +++ b/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageConfigurable.java @@ -15,7 +15,6 @@ */ package com.intellij.psi.templateLanguages; -import com.intellij.icons.AllIcons; import com.intellij.lang.LangBundle; import com.intellij.lang.Language; import com.intellij.openapi.application.ApplicationNamesInfo; @@ -29,8 +28,6 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.swing.*; - /** * @author peter */ @@ -59,12 +56,6 @@ public class TemplateDataLanguageConfigurable extends LanguagePerFileConfigurabl return LangBundle.message("template.data.language.configurable"); } - @Override - @Nullable - public Icon getIcon() { - return AllIcons.General.ConfigurableFileTypes; - } - @Override @Nullable @NonNls diff --git a/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java b/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java index 24eb6f6c6279..d950780b8956 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java @@ -39,10 +39,6 @@ public class ToolConfigurable implements SearchableConfigurable, Configurable.No return myPanel; } - public Icon getIcon() { - return ourIcon; - } - public void apply() throws ConfigurationException { try { myPanel.apply(); diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurable.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurable.java index 7a1e768a1807..0bd9370b7f0f 100644 --- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurable.java +++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurable.java @@ -43,10 +43,6 @@ public class FileColorsConfigurable implements SearchableConfigurable, Configura return "File Colors"; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "reference.settings.ide.settings.file-colors"; } diff --git a/platform/platform-api/src/com/intellij/openapi/options/Configurable.java b/platform/platform-api/src/com/intellij/openapi/options/Configurable.java index 596cd34e91b5..83dc967be46b 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/Configurable.java +++ b/platform/platform-api/src/com/intellij/openapi/options/Configurable.java @@ -20,8 +20,6 @@ import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; -import javax.swing.*; - /** * Named component which provides a configuration user interface. * @@ -63,14 +61,6 @@ public interface Configurable extends UnnamedConfigurable { @Nls String getDisplayName(); - /** - * Returns the icon representing the settings component. Components - * shown in the IDEA settings dialog have 32x32 icons. - * - * @return the icon for the component. - */ - @Nullable Icon getIcon(); - /** * Returns the topic in the help file which is shown when help for the configurable * is requested. diff --git a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java index c2d5c3365ef7..78ab47f04827 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java @@ -16,7 +16,6 @@ package com.intellij.openapi.ui; import com.intellij.CommonBundle; -import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.options.Configurable; @@ -880,10 +879,6 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom return ""; } - public Icon getIcon() { - return AllIcons.General.ApplicationSettings; - } - @Nullable @NonNls public String getHelpTopic() { diff --git a/platform/platform-api/src/com/intellij/openapi/ui/NamedConfigurable.java b/platform/platform-api/src/com/intellij/openapi/ui/NamedConfigurable.java index 97ae609f35e1..12b84f8db465 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/NamedConfigurable.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/NamedConfigurable.java @@ -111,8 +111,7 @@ public abstract class NamedConfigurable implements Configurable { public abstract JComponent createOptionsPanel(); @Nullable - public Icon getIcon(boolean open) { - return getIcon(); + public Icon getIcon(boolean expanded) { + return null; } - } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/NamedItemsListEditor.java b/platform/platform-api/src/com/intellij/openapi/ui/NamedItemsListEditor.java index b57ccb0b8ef3..5523416bb782 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/NamedItemsListEditor.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/NamedItemsListEditor.java @@ -213,14 +213,7 @@ public abstract class NamedItemsListEditor extends MasterDetailsComponent { return myNamer.getName(myItem); } - public Icon getIcon() { - if (myConfigurable instanceof Iconable) { - return ((Iconable)myConfigurable).getIcon(0); - } - return null; - } - - public String getHelpTopic() { + public String getHelpTopic() { return null; } diff --git a/platform/platform-api/src/com/intellij/util/net/HTTPProxySettingsPanel.java b/platform/platform-api/src/com/intellij/util/net/HTTPProxySettingsPanel.java index 43fb90248fff..cb7f06e5b98a 100644 --- a/platform/platform-api/src/com/intellij/util/net/HTTPProxySettingsPanel.java +++ b/platform/platform-api/src/com/intellij/util/net/HTTPProxySettingsPanel.java @@ -22,8 +22,8 @@ import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import javax.swing.*; -import javax.swing.event.DocumentListener; import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -166,10 +166,6 @@ public class HTTPProxySettingsPanel implements SearchableConfigurable, Configura return "HTTP Proxy"; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "http.proxy"; } diff --git a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java index 11761bcd5190..d11c769f7ff1 100644 --- a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java +++ b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java @@ -72,10 +72,6 @@ public class PathMacroConfigurable implements SearchableConfigurable, Configurab return myEditor != null && myEditor.isModified(); } - public Icon getIcon() { - return ICON; - } - @NotNull public String getId() { return getHelpTopic(); diff --git a/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java b/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java index 97a057948aa5..b316b959415f 100644 --- a/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java +++ b/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java @@ -45,10 +45,6 @@ public class BrowserSettings implements Configurable, SearchableConfigurable { return IdeBundle.message("browsers.settings"); } - public Icon getIcon() { - return ICON; - } - public String getHelpTopic() { return "reference.settings.ide.settings.web.browsers"; } diff --git a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java index afc512824019..a72ba4dc3fe8 100644 --- a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java @@ -15,7 +15,6 @@ */ package com.intellij.ide; -import com.intellij.icons.AllIcons; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.options.*; import org.jetbrains.annotations.NotNull; @@ -123,10 +122,6 @@ public class GeneralSettingsConfigurable extends CompositeConfigurable { public MethodParameterInjectionConfigurable(MethodParameterInjection injection, Runnable treeUpdater, Project project) { super(injection, treeUpdater, project); @@ -34,8 +31,4 @@ public class MethodParameterInjectionConfigurable extends InjectionConfigurable< public String getBannerSlogan() { return "Edit Method Parameter Injection"; } - - public Icon getIcon() { - return PlatformIcons.METHOD_ICON; - } } diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java index 71072b230213..d1ffe9c0396a 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java @@ -522,10 +522,6 @@ public class InjectionsSettingsUI implements SearchableConfigurable.Parent, NonD return "Language Injections"; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "reference.settings.injection.language.injection.settings"; } diff --git a/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/configurables/XmlAttributeInjectionConfigurable.java b/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/configurables/XmlAttributeInjectionConfigurable.java index ba20130484ab..a0898e0e8664 100644 --- a/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/configurables/XmlAttributeInjectionConfigurable.java +++ b/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/configurables/XmlAttributeInjectionConfigurable.java @@ -16,12 +16,9 @@ package org.intellij.plugins.intelliLang.inject.config.ui.configurables; import com.intellij.openapi.project.Project; -import com.intellij.util.PlatformIcons; import org.intellij.plugins.intelliLang.inject.config.XmlAttributeInjection; import org.intellij.plugins.intelliLang.inject.config.ui.XmlAttributePanel; -import javax.swing.*; - public class XmlAttributeInjectionConfigurable extends InjectionConfigurable { public XmlAttributeInjectionConfigurable(XmlAttributeInjection injection, Runnable treeUpdater, Project project) { super(injection, treeUpdater, project); @@ -34,8 +31,4 @@ public class XmlAttributeInjectionConfigurable extends InjectionConfigurable { public XmlTagInjectionConfigurable(XmlTagInjection injection, Runnable treeUpdater, Project project) { super(injection, treeUpdater, project); @@ -34,8 +31,4 @@ public class XmlTagInjectionConfigurable extends InjectionConfigurable { return myCopyrightProfile.getName(); } - @Nullable - public Icon getIcon() { - return null; - } - @Nullable @NonNls public String getHelpTopic() { diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java index 83ee88914c06..f41522763065 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java @@ -55,10 +55,6 @@ public class CopyrightFormattingConfigurable extends SearchableConfigurable.Pare return "Formatting"; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return getId(); } diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java index 362674e2510e..a1adad6705ef 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java @@ -96,12 +96,7 @@ public class CopyrightProfilesPanel extends MasterDetailsComponent implements Se return "Copyright Profiles"; } - @Nullable - public Icon getIcon() { - return null; - } - - @Nullable + @Nullable @NonNls public String getHelpTopic() { return "copyright.profiles"; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java index 5d675b252b3b..c1a0401e8c5d 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java @@ -45,10 +45,6 @@ public class CopyrightProjectConfigurable extends SearchableConfigurable.Parent. return "Copyright"; } - public Icon getIcon() { - return icon; - } - public String getHelpTopic() { return getId(); } diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.java index 68a1053bd488..6700b8a09fd0 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.java @@ -360,10 +360,6 @@ public class TemplateCommentPanel implements SearchableConfigurable { return fileType.getName(); } - public Icon getIcon() { - return fileType.getIcon(); - } - public String getHelpTopic() { return "copyright.filetypes"; } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/Cvs2Configurable.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/Cvs2Configurable.java index 7757247b5a9d..3f762ef70862 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/Cvs2Configurable.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/Cvs2Configurable.java @@ -37,11 +37,6 @@ class Cvs2Configurable implements Configurable { return "CVS2"; } - public Icon getIcon() { - - return null; - } - public String getHelpTopic() { return "reference.projectsettings.vcs.cvs.options"; } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/UpdateConfigurable.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/UpdateConfigurable.java index f357e69ae8fd..5232cbe23a62 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/UpdateConfigurable.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/UpdateConfigurable.java @@ -15,12 +15,12 @@ */ package com.intellij.cvsSupport2; +import com.intellij.CvsBundle; import com.intellij.cvsSupport2.cvsoperations.cvsUpdate.ui.UpdateOptionsPanel; import com.intellij.openapi.options.BaseConfigurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.FilePath; -import com.intellij.CvsBundle; import javax.swing.*; import java.util.Collection; @@ -40,10 +40,6 @@ public class UpdateConfigurable extends BaseConfigurable { return CvsBundle.getCvsDisplayName(); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "reference.versionControl.cvs.options"; } diff --git a/plugins/devkit/src/build/PluginModuleBuildConfEditor.java b/plugins/devkit/src/build/PluginModuleBuildConfEditor.java index 22f65a0aa09c..d1b4b9a06169 100644 --- a/plugins/devkit/src/build/PluginModuleBuildConfEditor.java +++ b/plugins/devkit/src/build/PluginModuleBuildConfEditor.java @@ -15,7 +15,6 @@ */ package org.jetbrains.idea.devkit.build; -import com.intellij.icons.AllIcons; import com.intellij.ide.util.BrowseFilesListener; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.module.Module; @@ -140,10 +139,6 @@ public class PluginModuleBuildConfEditor implements ModuleConfigurationEditor { return DevKitBundle.message("deployment.title"); } - public Icon getIcon() { - return AllIcons.Nodes.Plugin; - } - public String getHelpTopic() { return "plugin.configuring"; } diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java index 8226c65b0473..34d19754fe36 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java @@ -225,11 +225,7 @@ public class GenerateToStringActionHandlerImpl extends EditorWriteActionHandler return "toString() Generation Settings"; } - public Icon getIcon() { - return null; - } - - public String getHelpTopic() { + public String getHelpTopic() { return null; // TODO: } diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringConfigurable.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringConfigurable.java index d81fe5fe468f..797dda99a641 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringConfigurable.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringConfigurable.java @@ -22,7 +22,6 @@ import org.jetbrains.generate.tostring.config.Config; import org.jetbrains.generate.tostring.view.ConfigUI; import javax.swing.*; -import java.net.URL; /** * @author yole @@ -36,14 +35,6 @@ public class GenerateToStringConfigurable implements Configurable { return "Settings"; } - public Icon getIcon() { - URL resource = getClass().getResource("/resources/configurableToStringPlugin.png"); - if (resource != null) { - return new ImageIcon(resource); - } - return null; - } - public String getHelpTopic() { return null; } diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/TemplatesPanel.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/TemplatesPanel.java index 2c2fffb0ca5b..53d59f412222 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/TemplatesPanel.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/TemplatesPanel.java @@ -33,7 +33,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.generate.tostring.template.TemplateResource; import org.jetbrains.generate.tostring.template.TemplatesManager; -import javax.swing.*; import java.util.ArrayList; public class TemplatesPanel extends NamedItemsListEditor { @@ -89,12 +88,7 @@ public class TemplatesPanel extends NamedItemsListEditor { return "Templates"; } - @Nullable - public Icon getIcon() { - return null; - } - - @Override + @Override protected String subjDisplayName() { return "template"; } @@ -128,4 +122,4 @@ public class TemplatesPanel extends NamedItemsListEditor { TemplatesManager.getInstance().setDefaultTemplate(selection); } } -} \ No newline at end of file +} diff --git a/plugins/git4idea/src/git4idea/config/GitVcsConfigurable.java b/plugins/git4idea/src/git4idea/config/GitVcsConfigurable.java index 109167dcde3f..12dd5fb1e5d7 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsConfigurable.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsConfigurable.java @@ -41,12 +41,6 @@ public class GitVcsConfigurable implements Configurable { return GitVcs.NAME; } - @Nullable - @Override - public Icon getIcon() { - return null; - } - @Nullable @Override public String getHelpTopic() { diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateConfigurable.java b/plugins/git4idea/src/git4idea/update/GitUpdateConfigurable.java index a07ee8d338d9..4223bb77a7ac 100644 --- a/plugins/git4idea/src/git4idea/update/GitUpdateConfigurable.java +++ b/plugins/git4idea/src/git4idea/update/GitUpdateConfigurable.java @@ -48,13 +48,6 @@ public class GitUpdateConfigurable implements Configurable { return GitBundle.getString("update.options.display.name"); } - /** - * {@inheritDoc} - */ - public Icon getIcon() { - return null; - } - /** * {@inheritDoc} */ diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java index 3ec134a45def..d633ed943049 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java +++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java @@ -4,7 +4,6 @@ import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.github.GithubSettings; -import org.jetbrains.plugins.github.GithubUtil; import javax.swing.*; @@ -23,10 +22,6 @@ public class GitHubSettingsConfigurable implements SearchableConfigurable { return "GitHub"; } - public Icon getIcon() { - return GithubUtil.GITHUB_ICON; - } - @NotNull public String getHelpTopic() { return "settings.github"; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleConfigurable.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleConfigurable.java index 66613bf3e643..a4d5edb3b594 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleConfigurable.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleConfigurable.java @@ -28,7 +28,6 @@ import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.plugins.gradle.ui.GradleIcons; import org.jetbrains.plugins.gradle.util.*; import javax.swing.*; @@ -267,10 +266,6 @@ public class GradleConfigurable implements SearchableConfigurable, Configurable. myPathManuallyModified = false; } - public Icon getIcon() { - return GradleIcons.GRADLE_ICON; - } - @NotNull public String getHelpTopic() { return HELP_TOPIC; @@ -339,4 +334,4 @@ public class GradleConfigurable implements SearchableConfigurable, Configurable. GradleUtil.showBalloon(myGradleHomeComponent.getPathComponent(), myMessageType, myText); } } -} \ No newline at end of file +} diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java index 9c82159f2b91..99d3828dd6a3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java @@ -34,7 +34,6 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.groovy.GroovyIcons; import javax.swing.*; import java.util.Arrays; @@ -92,10 +91,6 @@ public class GroovyCompilerConfigurable implements SearchableConfigurable, Confi return "Groovy Compiler"; } - public Icon getIcon() { - return GroovyIcons.GROOVY_ICON_16x16; - } - public String getHelpTopic() { return "reference.projectsettings.compiler.groovy"; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerSettingsConfigurable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerSettingsConfigurable.java index dd25deabe60d..5d70a40a94d8 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerSettingsConfigurable.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerSettingsConfigurable.java @@ -20,7 +20,6 @@ import com.intellij.openapi.options.SearchableConfigurable; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.GroovyBundle; -import org.jetbrains.plugins.groovy.GroovyIcons; import javax.swing.*; import java.awt.event.ActionEvent; @@ -57,10 +56,6 @@ public class GroovyDebuggerSettingsConfigurable implements SearchableConfigurabl return GroovyBundle.message("groovy.debug.caption"); } - public Icon getIcon() { - return GroovyIcons.GROOVY_ICON_16x16; - } - public String getHelpTopic() { return "reference.idesettings.debugger.groovy"; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantConfigurable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantConfigurable.java index 10154b43f9c6..c8d9c8e3d1be 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantConfigurable.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantConfigurable.java @@ -20,8 +20,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.plugins.groovy.util.SdkHomeConfigurable; -import javax.swing.*; - /** * @author peter */ @@ -31,10 +29,6 @@ public class GantConfigurable extends SdkHomeConfigurable implements Configurabl super(project, "Gant"); } - public Icon getIcon() { - return GantIcons.GANT_ICON_16x16; - } - public String getHelpTopic() { return "reference.settingsdialog.project.gant"; } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectConfigurable.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectConfigurable.java index 3417a4906c7c..c058e67bb51c 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectConfigurable.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectConfigurable.java @@ -33,10 +33,6 @@ public class HgProjectConfigurable implements SearchableConfigurable { return HgVcsMessages.message("hg4idea.mercurial"); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "project.propVCSSupport.VCSs.Mercurial"; } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdateEnvironment.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdateEnvironment.java index d05ceeee8758..39a29eed9c60 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdateEnvironment.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdateEnvironment.java @@ -98,10 +98,6 @@ public class HgUpdateEnvironment implements UpdateEnvironment { return "Update"; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return null; } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgIntegrateDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgIntegrateDialog.java index 1af47c08ef8d..b3b8a1024492 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgIntegrateDialog.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgIntegrateDialog.java @@ -103,10 +103,6 @@ public class HgIntegrateDialog implements Configurable { return null; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return null; } @@ -223,4 +219,4 @@ public class HgIntegrateDialog implements Configurable { public void disposeUIResources() { } -} \ No newline at end of file +} diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/CompositeConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/CompositeConfigurable.java index 796ea5b9b9e5..3dd183bab08f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/CompositeConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/CompositeConfigurable.java @@ -88,9 +88,4 @@ public class CompositeConfigurable implements Configurable { public String getDisplayName() { return null; } - - @Nullable - public Icon getIcon() { - return null; - } -} \ No newline at end of file +} diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java index ec90fbee1d6d..8323a9da5960 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java @@ -163,11 +163,6 @@ public abstract class MavenRunnerConfigurable implements SearchableConfigurable, return RunnerBundle.message("maven.tab.runner"); } - @Nullable - public Icon getIcon() { - return null; - } - @Nullable @NonNls public String getHelpTopic() { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.java index ade900ed3fe1..3133b6d3507d 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.java @@ -36,7 +36,10 @@ import org.jetbrains.idea.maven.model.MavenConstants; import org.jetbrains.idea.maven.model.MavenPlugin; import org.jetbrains.idea.maven.project.MavenProject; import org.jetbrains.idea.maven.project.MavenProjectsManager; -import org.jetbrains.idea.maven.utils.*; +import org.jetbrains.idea.maven.utils.MavenArtifactUtil; +import org.jetbrains.idea.maven.utils.MavenIcons; +import org.jetbrains.idea.maven.utils.MavenPluginInfo; +import org.jetbrains.idea.maven.utils.Strings; import javax.swing.*; import java.util.*; @@ -136,11 +139,6 @@ public abstract class MavenRunnerParametersConfigurable implements Configurable, return RunnerBundle.message("maven.runner.parameters.title"); } - @Nullable - public Icon getIcon() { - return null; - } - @Nullable @NonNls public String getHelpTopic() { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.java index 9dc12ea15fb4..345920cab0d3 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.java @@ -218,10 +218,6 @@ public class MavenRepositoriesConfigurable extends BaseConfigurable implements S return IndicesBundle.message("maven.repositories.title"); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "reference.settings.project.maven.repository.indices"; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.java index ec2a56b126ac..7bc2a6832b22 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.java @@ -179,11 +179,6 @@ public abstract class MavenGeneralConfigurable implements SearchableConfigurable return ProjectBundle.message("maven.tab.general"); } - @Nullable - public Icon getIcon() { - return null; - } - @Nullable @NonNls public String getHelpTopic() { @@ -210,4 +205,4 @@ public abstract class MavenGeneralConfigurable implements SearchableConfigurable myMultiprojectBuildFailPolicyLabel.setAnchor(anchor); mavenPathsForm.setAnchor(anchor); } -} \ No newline at end of file +} diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java index 40fad94c41c5..3a7e8871d33b 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java @@ -90,11 +90,6 @@ public class MavenIgnoredFilesConfigurable implements SearchableConfigurable, Co return ProjectBundle.message("maven.tab.ignored.files"); } - @Nullable - public Icon getIcon() { - return null; - } - @Nullable @NonNls public String getHelpTopic() { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java index 97ce892739b1..4f76bcd9c7b6 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java @@ -88,11 +88,6 @@ public class MavenImportingConfigurable implements SearchableConfigurable { return ProjectBundle.message("maven.tab.importing"); } - @Nullable - public Icon getIcon() { - return null; - } - @Nullable @NonNls public String getHelpTopic() { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenSettings.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenSettings.java index a5d3e6ac2b23..fac69a2cce05 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenSettings.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenSettings.java @@ -15,7 +15,6 @@ */ package org.jetbrains.idea.maven.utils; -import com.intellij.icons.AllIcons; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; @@ -109,10 +108,6 @@ public class MavenSettings implements SearchableConfigurable.Parent { return DISPLAY_NAME; } - public Icon getIcon() { - return AllIcons.General.ConfigurableEditor; - } - public String getHelpTopic() { return myConfigurable.getHelpTopic(); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectImportStep.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectImportStep.java index 046a0ee1d38f..39fca0a4efc1 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectImportStep.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectImportStep.java @@ -153,11 +153,6 @@ public class MavenProjectImportStep extends ProjectImportWizardStep { return ProjectBundle.message("maven.import.environment.settings.title"); } - @Nullable - public Icon getIcon() { - return null; - } - @Nullable @NonNls public String getHelpTopic() { diff --git a/plugins/rearranger/src/com/wrq/rearranger/Rearranger.java b/plugins/rearranger/src/com/wrq/rearranger/Rearranger.java index 2f9b590023bd..de4fadf1be38 100644 --- a/plugins/rearranger/src/com/wrq/rearranger/Rearranger.java +++ b/plugins/rearranger/src/com/wrq/rearranger/Rearranger.java @@ -27,7 +27,6 @@ import com.intellij.openapi.options.Configurable; import com.intellij.openapi.util.JDOMExternalizable; import com.wrq.rearranger.configuration.RearrangerSettingsPanel; import com.wrq.rearranger.settings.RearrangerSettings; -import com.wrq.rearranger.util.IconUtil; import org.jdom.Element; import javax.swing.*; @@ -132,10 +131,6 @@ public final class Rearranger return COMPONENT_NAME; } - public Icon getIcon() { - return IconUtil.getIcon("RearrangerIcon"); - } - public String getHelpTopic() { return null; } diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsManager.java b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsManager.java index 6fe58742a913..161b22848eb0 100644 --- a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsManager.java +++ b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsManager.java @@ -42,12 +42,7 @@ public class SpellCheckerSettingsManager implements SearchableConfigurable, Conf return SpellCheckerBundle.message("spelling"); } - @Nullable - public Icon getIcon() { - return null; - } - - @Nullable + @Nullable @NonNls public String getHelpTopic() { return "reference.settings.ide.settings.spelling"; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurable.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurable.java index 38e0f9da83f6..bfa8be754cfd 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurable.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurable.java @@ -168,10 +168,6 @@ public class SvnConfigurable implements Configurable { return null; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return HELP_ID; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/GroupConfigurable.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/GroupConfigurable.java index 628b420fd5de..b3ec97403bb6 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/GroupConfigurable.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/GroupConfigurable.java @@ -58,10 +58,6 @@ public class GroupConfigurable extends NamedConfigurable { return myProxyGroup.getName(); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return null; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java index b59a881edf55..b5f8551deef4 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java @@ -73,10 +73,6 @@ public class SvnConfigureProxiesComponent extends MasterDetailsComponent { return "HTTP proxies configuration"; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return null; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceDetails.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceDetails.java index 600a12fe8990..f3ed60277dd5 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceDetails.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceDetails.java @@ -97,10 +97,6 @@ public class SvnMergeSourceDetails extends MasterDetailsComponent { return null; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return null; } @@ -228,10 +224,6 @@ public class SvnMergeSourceDetails extends MasterDetailsComponent { return getBannerSlogan(); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return null; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateConfigurable.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateConfigurable.java index a74ef2711ed4..38a9591eab4b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateConfigurable.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateConfigurable.java @@ -43,10 +43,6 @@ public abstract class SvnUpdateConfigurable implements Configurable { myPanel.apply(SvnConfiguration.getInstance(myProject)); } - public Icon getIcon() { - return null; - } - public JComponent createComponent() { myPanel = createPanel(); return myPanel.getPanel(); diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.java index 1d477b7cd55f..012cc521f3ed 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.java @@ -114,10 +114,6 @@ public class TaskConfigurable extends BindableConfigurable implements Searchable return "Tasks"; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "reference.settings.project.tasks"; } diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskRepositoriesConfigurable.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskRepositoriesConfigurable.java index 5c28cb6271eb..03312e13a1df 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskRepositoriesConfigurable.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskRepositoriesConfigurable.java @@ -206,10 +206,6 @@ public class TaskRepositoriesConfigurable extends BaseConfigurable implements Co return "Servers"; } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return "reference.settings.project.tasks.servers"; } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java index 4ebcc2376b7d..fa013d413f70 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java @@ -63,10 +63,6 @@ public final class GuiDesignerConfigurable implements SearchableConfigurable, Co return UIDesignerBundle.message("title.gui.designer"); } - public Icon getIcon() { - return AllIcons.General.UiDesigner; - } - @NotNull public String getHelpTopic() { return "project.propGUI"; 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 802299c1d27a..0313fb41ded6 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 @@ -20,10 +20,8 @@ import com.intellij.ide.util.treeView.TreeState; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.application.Result; import com.intellij.openapi.components.*; -import com.intellij.openapi.components.StoragePathMacros; import com.intellij.openapi.options.*; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; @@ -43,11 +41,7 @@ public class FileAssociationsConfigurable implements SearchableConfigurable, Non return "XSLT File Associations"; } - public Icon getIcon() { - return IconLoader.getIcon("/icons/association_large.png"); - } - - @NotNull + @NotNull public String getHelpTopic() { return "xslt.associations"; } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltConfigImpl.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltConfigImpl.java index d3c97a08cff1..605ae8088ef5 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltConfigImpl.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltConfigImpl.java @@ -110,12 +110,7 @@ class XsltConfigImpl extends XsltConfig implements JDOMExternalizable, Applicati return "XSLT"; } - @Nullable - public Icon getIcon() { - return null; - } - - @Nullable + @Nullable @NonNls public String getHelpTopic() { return "settings.xslt"; @@ -160,4 +155,4 @@ class XsltConfigImpl extends XsltConfig implements JDOMExternalizable, Applicati } } -} \ No newline at end of file +} diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathConfigurable.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathConfigurable.java index cb8cfd84f26a..af8ed96880d5 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathConfigurable.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathConfigurable.java @@ -17,7 +17,6 @@ package org.intellij.plugins.xpathView; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; -import com.intellij.openapi.util.IconLoader; import org.intellij.plugins.xpathView.ui.ConfigUI; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,11 +30,7 @@ public class XPathConfigurable implements SearchableConfigurable { return "XPath Viewer"; } - public Icon getIcon() { - return IconLoader.getIcon("/icons/xml_big.png"); - } - - @Nullable + @Nullable public String getHelpTopic() { return "xpath.settings"; } diff --git a/xml/impl/src/com/intellij/application/options/HtmlCodeStyleSettingsProvider.java b/xml/impl/src/com/intellij/application/options/HtmlCodeStyleSettingsProvider.java index c5b94502fd14..ae50e86e9e22 100644 --- a/xml/impl/src/com/intellij/application/options/HtmlCodeStyleSettingsProvider.java +++ b/xml/impl/src/com/intellij/application/options/HtmlCodeStyleSettingsProvider.java @@ -15,15 +15,12 @@ */ package com.intellij.application.options; -import com.intellij.openapi.options.Configurable; import com.intellij.openapi.application.ApplicationBundle; -import com.intellij.openapi.fileTypes.StdFileTypes; +import com.intellij.openapi.options.Configurable; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsProvider; import org.jetbrains.annotations.NotNull; -import javax.swing.*; - /** * @author yole */ @@ -34,9 +31,6 @@ public class HtmlCodeStyleSettingsProvider extends CodeStyleSettingsProvider { protected CodeStyleAbstractPanel createPanel(final CodeStyleSettings settings) { return new CodeStyleHtmlPanel(settings); } - public Icon getIcon() { - return StdFileTypes.HTML.getIcon(); - } public String getHelpTopic() { return "reference.settingsdialog.IDE.globalcodestyle.html"; diff --git a/xml/impl/src/com/intellij/application/options/XmlCodeStyleSettingsProvider.java b/xml/impl/src/com/intellij/application/options/XmlCodeStyleSettingsProvider.java index b3dc42407151..2162de19f63a 100644 --- a/xml/impl/src/com/intellij/application/options/XmlCodeStyleSettingsProvider.java +++ b/xml/impl/src/com/intellij/application/options/XmlCodeStyleSettingsProvider.java @@ -15,17 +15,14 @@ */ package com.intellij.application.options; -import com.intellij.psi.codeStyle.CodeStyleSettingsProvider; -import com.intellij.psi.codeStyle.CodeStyleSettings; -import com.intellij.openapi.options.Configurable; import com.intellij.openapi.application.ApplicationBundle; -import com.intellij.openapi.fileTypes.StdFileTypes; +import com.intellij.openapi.options.Configurable; +import com.intellij.psi.codeStyle.CodeStyleSettings; +import com.intellij.psi.codeStyle.CodeStyleSettingsProvider; import com.intellij.psi.codeStyle.CustomCodeStyleSettings; import com.intellij.psi.formatter.xml.XmlCodeStyleSettings; import org.jetbrains.annotations.NotNull; -import javax.swing.*; - /** * @author yole */ @@ -36,9 +33,6 @@ public class XmlCodeStyleSettingsProvider extends CodeStyleSettingsProvider { protected CodeStyleAbstractPanel createPanel(final CodeStyleSettings settings) { return new XmlCodeStyleMainPanel(getCurrentSettings(), settings); } - public Icon getIcon() { - return StdFileTypes.XML.getIcon(); - } public String getHelpTopic() { return "reference.settingsdialog.IDE.globalcodestyle.xml"; diff --git a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java index 8ea742f5bcdf..eb1ff2ad95f6 100644 --- a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java +++ b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java @@ -56,10 +56,6 @@ public class WebEditorOptionsProvider implements EditorOptionsProvider { return XmlBundle.message("web.editor.configuration.title"); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return null; } diff --git a/xml/impl/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java b/xml/impl/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java index 76734c6af00f..adec612ba7e7 100644 --- a/xml/impl/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java +++ b/xml/impl/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java @@ -152,11 +152,6 @@ public class ChromeSettingsConfigurable implements Configurable { return "Chrome Settings"; } - @Override - public Icon getIcon() { - return null; - } - @Override public String getHelpTopic() { return null; diff --git a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java b/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java index 4fe14efb30d2..fb92f516af05 100644 --- a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java +++ b/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java @@ -24,8 +24,8 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.DocumentAdapter; import com.intellij.xml.XmlBundle; -import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.event.DocumentEvent; @@ -137,10 +137,6 @@ public class FirefoxSettingsConfigurable implements Configurable { return XmlBundle.message("display.name.firefox.settings"); } - public Icon getIcon() { - return null; - } - public String getHelpTopic() { return null; } diff --git a/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java b/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java index e084fabdb6d7..55bdf84d4f02 100644 --- a/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java +++ b/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java @@ -15,7 +15,6 @@ */ package com.intellij.javaee; -import com.intellij.icons.AllIcons; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.options.BaseConfigurable; import com.intellij.openapi.options.Configurable; @@ -150,10 +149,6 @@ public class ExternalResourceConfigurable extends BaseConfigurable implements Se return myPanel; } - public Icon getIcon() { - return AllIcons.General.ConfigurableExternalResources; - } - public void apply() { ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() {