Configurables no longer have icons.

2026-09-27 10:03:11 +07:00 · 2012-05-30 21:46:44 +04:00
parent b83dacd894
commit 0b582bf6d5
186 changed files with 58 additions and 947 deletions
@@ -47,10 +47,6 @@ public class EclipseCompilerConfigurable implements Configurable {
    return null;
  }

-  public Icon getIcon() {
-    return null;
-  }
-
  @Nullable
  @NonNls
  public String getHelpTopic() {
@@ -45,10 +45,6 @@ public class JavacConfigurable implements Configurable{
    return null;
  }

-  public Icon getIcon() {
-    return null;
-  }
-
  public String getHelpTopic() {
    return null;
  }
@@ -62,10 +62,6 @@ public class JikesConfigurable implements Configurable {
    return null;
  }

-  public Icon getIcon() {
-    return null;
-  }
-
  public String getHelpTopic() {
    return null;
  }
@@ -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";
  }
@@ -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";
      }
@@ -178,10 +178,6 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
    return "General";
  }

-  public Icon getIcon() {
-    return null;
-  }
-
  public String getHelpTopic() {
    return null;
  }
@@ -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";
  }
@@ -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";
  }
@@ -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;
    }
@@ -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;
      }
@@ -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();
@@ -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() {
  }

-}
+}
@@ -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";
  }
@@ -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;
  }

-}
+}
@@ -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();
@@ -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"; 
  }
@@ -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) {
@@ -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<C extends FacetConfiguration> impl
    return ProjectBundle.message("facet.defaults.display.name");
  }

-  public Icon getIcon() {
-    return null;
-  }
-
  public String getHelpTopic() {
    return myDelegate.getHelpTopic();
  }
@@ -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();
    }
@@ -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;
  }
@@ -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();
@@ -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() {
@@ -72,10 +72,6 @@ public class ClasspathEditor extends ModuleElementsEditor implements ModuleRootL
    return NAME;
  }

-  public Icon getIcon() {
-    return ICON;
-  }
-
  public void saveData() {
    myPanel.stopEditing();
    flushChangesToModel();
@@ -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();
@@ -42,10 +42,6 @@ class ModuleConfigurableWrapper implements ModuleConfigurationEditor {
    return myModuleConfigurable.getDisplayName();
  }

-  public Icon getIcon() {
-    return myModuleConfigurable.getIcon();
-  }
-
  public String getHelpTopic() {
    return myModuleConfigurable.getHelpTopic();
  }
@@ -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();
@@ -245,7 +245,7 @@ public class ProjectConfigurable extends ProjectStructureElementConfigurable<Pro
    return ProjectBundle.message("project.roots.project.display.name");
  }

-  public Icon getIcon() {
+  public Icon getIcon(boolean open) {
    return PROJECT_ICON;
  }

@@ -44,7 +44,6 @@ import com.intellij.util.containers.Convertor;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;

-import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
 import java.awt.*;
@@ -206,11 +205,6 @@ public class ProjectJdksConfigurable extends MasterDetailsComponent {
    return null;
  }

-  @Nullable
-  public Icon getIcon() {
-    return null;
-  }
-
  @Nullable
  @NonNls
  public String getHelpTopic() {
@@ -16,7 +16,6 @@
 package com.intellij.openapi.roots.ui.configuration;

 import com.intellij.facet.Facet;
-import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.components.ServiceManager;
@@ -157,11 +156,6 @@ public class ProjectStructureConfigurable extends BaseConfigurable implements Se
    return ProjectBundle.message("project.settings.display.name");
  }

-  @Nullable
-  public Icon getIcon() {
-    return AllIcons.Modules.Modules;
-  }
-
  @Nullable
  @NonNls
  public String getHelpTopic() {
@@ -43,7 +43,7 @@ public abstract class TabbedModuleEditor extends ModuleEditor {
    myTabbedPane = new TabbedPaneWrapper(this);

    for (ModuleConfigurationEditor editor : myEditors) {
-      myTabbedPane.addTab(editor.getDisplayName(), editor.getIcon(), editor.createComponent(), null);
+      myTabbedPane.addTab(editor.getDisplayName(), editor.createComponent());
      editor.reset();
    }
    restoreSelectedEditor();
@@ -63,7 +63,7 @@ public abstract class ArtifactConfigurableBase extends ProjectStructureElementCo
    return getArtifact().getName();
  }

-  public Icon getIcon() {
+  public Icon getIcon(boolean open) {
    return getArtifact().getArtifactType().getIcon();
  }

@@ -356,10 +356,6 @@ public class ArtifactsStructureConfigurable extends BaseStructureConfigurable {
  public void dispose() {
  }

-  public Icon getIcon() {
-    return null;
-  }
-
  private class AddArtifactAction extends DumbAwareAction {
    private final ArtifactType myType;
    private final ArtifactTemplate myArtifactTemplate;
@@ -184,14 +184,6 @@ public class AnalyzeDependenciesComponent extends MasterDetailsComponent {
    return "Classpath Details";
  }

-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public Icon getIcon() {
-    return null;
-  }
-
  /**
   * Reload tree
   */
@@ -576,8 +568,7 @@ public class AnalyzeDependenciesComponent extends MasterDetailsComponent {
    /**
     * {@inheritDoc}
     */
-    @Override
-    public Icon getIcon() {
+    private Icon getIcon() {
      return myExplanation.getIcon();
    }

@@ -655,15 +646,6 @@ public class AnalyzeDependenciesComponent extends MasterDetailsComponent {
      }
    }

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Icon getIcon() {
-      // Icon is displayed using cell appearance
-      return null;
-    }
-
    /**
     * {@inheritDoc}
     */
@@ -88,7 +88,7 @@ public class FacetConfigurable extends ProjectStructureElementConfigurable<Facet
  }

  @Nullable
-  public Icon getIcon() {
+  public Icon getIcon(boolean open) {
    return myFacet.getType().getIcon();
  }

@@ -352,10 +352,6 @@ public class FacetStructureConfigurable extends BaseStructureConfigurable {
    return ProjectBundle.message("project.facets.display.name");
  }

-  public Icon getIcon() {
-    return ICON;
-  }
-
  public String getHelpTopic() {
    final Component component = PlatformDataKeys.CONTEXT_COMPONENT.getData(DataManager.getInstance().getDataContext());
    if (myTree.equals(component)) {
@@ -15,11 +15,11 @@
 */
 package com.intellij.openapi.roots.ui.configuration.projectRoot;

-import com.intellij.openapi.ui.NamedConfigurable;
-import com.intellij.openapi.options.ConfigurationException;
-import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.facet.FacetType;
 import com.intellij.facet.impl.ui.facetType.FacetTypeEditor;
+import com.intellij.openapi.options.ConfigurationException;
+import com.intellij.openapi.project.ProjectBundle;
+import com.intellij.openapi.ui.NamedConfigurable;

 import javax.swing.*;

@@ -54,10 +54,6 @@ public class FacetTypeConfigurable extends NamedConfigurable<FacetType> {
    return myFacetType.getPresentableName();
  }

-  public Icon getIcon() {
-    return myFacetType.getIcon();
-  }
-
  public String getHelpTopic() {
    final FacetTypeEditor editor = myFacetStructureConfigurable.getFacetTypeEditor(myFacetType);
    return editor != null ? editor.getHelpTopic() : null;
@@ -63,11 +63,6 @@ public class FrameworkDetectionConfigurable extends NamedConfigurable<DetectionE
    return "Detection";
  }

-  @Override
-  public Icon getIcon() {
-    return myConfigurable.getIcon();
-  }
-
  @Override
  public String getHelpTopic() {
    return myConfigurable.getHelpTopic();
@@ -23,9 +23,6 @@ import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;

 public class GlobalLibrariesConfigurable extends BaseLibrariesConfigurable {

@@ -44,11 +41,6 @@ public class GlobalLibrariesConfigurable extends BaseLibrariesConfigurable {
    return "Global Libraries";
  }

-  @Nullable
-  public Icon getIcon() {
-    return null;
-  }
-
  @NotNull
  @NonNls
  public String getId() {
@@ -76,4 +68,4 @@ public class GlobalLibrariesConfigurable extends BaseLibrariesConfigurable {
  protected String getAddText() {
    return ProjectBundle.message("add.new.global.library.text");
  }
-}
+}
@@ -78,7 +78,7 @@ public class JdkConfigurable extends ProjectStructureElementConfigurable<Sdk> im
    return myProjectJdk.getName();
  }

-  public Icon getIcon() {
+  public Icon getIcon(boolean open) {
    return ((SdkType) myProjectJdk.getSdkType()).getIcon();
  }

@@ -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() {
@@ -166,7 +166,7 @@ public class LibraryConfigurable extends ProjectStructureElementConfigurable<Lib
    }
  }

-  public Icon getIcon() {
+  public Icon getIcon(boolean open) {
    return LibraryPresentationManager.getInstance().getNamedLibraryIcon(myLibrary, myContext);
  }

@@ -93,10 +93,6 @@ public class ModuleConfigurable extends ProjectStructureElementConfigurable<Modu
    return myModuleName;
  }

-  public Icon getIcon() {
-    return ModuleType.get(myModule).getNodeIcon(false);
-  }
-
  public Icon getIcon(final boolean open) {
    return ModuleType.get(myModule).getNodeIcon(open);
  }
@@ -416,10 +416,6 @@ public class ModuleStructureConfigurable extends BaseStructureConfigurable imple
    return ProjectBundle.message("project.roots.display.name");
  }

-  public Icon getIcon() {
-    return ICON;
-  }
-
  @Nullable
  @NonNls
  public String getHelpTopic() {
@@ -23,9 +23,6 @@ import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;

 public class ProjectLibrariesConfigurable extends BaseLibrariesConfigurable {
  public ProjectLibrariesConfigurable(final Project project) {
@@ -43,11 +40,6 @@ public class ProjectLibrariesConfigurable extends BaseLibrariesConfigurable {
    return "Libraries";
  }

-  @Nullable
-  public Icon getIcon() {
-    return null;
-  }
-
  @NotNull
  @NonNls
  public String getId() {
@@ -19,6 +19,8 @@ import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectStr
 import com.intellij.openapi.ui.NamedConfigurable;
 import org.jetbrains.annotations.Nullable;

+import javax.swing.*;
+
 /**
 * @author nik
 */
@@ -33,4 +35,8 @@ public abstract class ProjectStructureElementConfigurable<T> extends NamedConfig
  @Nullable
  public abstract ProjectStructureElement getProjectStructureElement();

+  @Nullable
+  public Icon getIcon(boolean open) {
+    return null;
+  }
 }
@@ -85,10 +85,6 @@ public class TextConfigurable<T> extends NamedConfigurable<T> {
    return myDisplayName;
  }

-  public Icon getIcon() {
-    return myOpenedIcon;
-  }
-
  public Icon getIcon(final boolean open) {
    return open ? myOpenedIcon : myClosedIcon;
  }
@@ -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");
@@ -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();
@@ -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";
  }
-}
+}
@@ -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;
@@ -146,10 +146,6 @@ public final class JavadocConfigurable implements Configurable {
    return null;
  }

-  public Icon getIcon() {
-    return null;
-  }
-
  public String getHelpTopic() {
    return "project.propJavaDoc";
  }