Acutally killing some dead icons

platform/util/src/com/intellij/icons/AllIcons.java

@@ -449,7 +449,9 @@ public class AllIcons {
     public static final Icon TodoDefault = IconLoader.getIcon("/general/todoDefault.png"); // 12x12
     public static final Icon TodoImportant = IconLoader.getIcon("/general/todoImportant.png"); // 12x12
     public static final Icon TodoQuestion = IconLoader.getIcon("/general/todoQuestion.png"); // 12x12
-    @SuppressWarnings("unused") public static final Icon ToolWindowChanges = IconLoader.getIcon("/general/toolWindowChanges.png"); // 13x13
+    
+    @SuppressWarnings("unused")
+    public static final Icon ToolWindowChanges = IconLoader.getIcon("/general/toolWindowChanges.png"); // 13x13
     public static final Icon WarningDialog = IconLoader.getIcon("/general/warningDialog.png"); // 32x32
     public static final Icon Web = IconLoader.getIcon("/general/web.png"); // 13x13
 

plugins/ui-designer/src/com/intellij/uiDesigner/actions/InsertAfterAction.java

@@ -19,14 +19,15 @@ package com.intellij.uiDesigner.actions;
 import com.intellij.uiDesigner.CaptionSelection;
 import com.intellij.uiDesigner.UIDesignerBundle;
 import com.intellij.uiDesigner.radComponents.RadContainer;
+import icons.UIDesignerIcons;
 
 /**
  * @author yole
 */
 public final class InsertAfterAction extends RowColumnAction {
   public InsertAfterAction() {
-    super(UIDesignerBundle.message("action.insert.column.after.this"), "/com/intellij/uiDesigner/icons/insertColumnRight.png",
-          UIDesignerBundle.message("action.insert.row.after.this"), "/com/intellij/uiDesigner/icons/insertRowBelow.png");
+    super(UIDesignerBundle.message("action.insert.column.after.this"), UIDesignerIcons.InsertColumnRight,
+          UIDesignerBundle.message("action.insert.row.after.this"), UIDesignerIcons.InsertRowBelow);
   }
 
   protected void actionPerformed(final CaptionSelection selection) {

plugins/ui-designer/src/com/intellij/uiDesigner/actions/InsertBeforeAction.java

@@ -19,14 +19,15 @@ package com.intellij.uiDesigner.actions;
 import com.intellij.uiDesigner.CaptionSelection;
 import com.intellij.uiDesigner.UIDesignerBundle;
 import com.intellij.uiDesigner.radComponents.RadContainer;
+import icons.UIDesignerIcons;
 
 /**
  * @author yole
 */
 public final class InsertBeforeAction extends RowColumnAction {
   public InsertBeforeAction() {
-    super(UIDesignerBundle.message("action.insert.column.before.this"), "/com/intellij/uiDesigner/icons/insertColumnLeft.png",
-          UIDesignerBundle.message("action.insert.row.before.this"), "/com/intellij/uiDesigner/icons/insertRowAbove.png");
+    super(UIDesignerBundle.message("action.insert.column.before.this"), UIDesignerIcons.InsertColumnLeft,
+          UIDesignerBundle.message("action.insert.row.before.this"), UIDesignerIcons.InsertRowAbove);
   }
 
   protected void actionPerformed(CaptionSelection selection) {

plugins/ui-designer/src/com/intellij/uiDesigner/actions/RowColumnAction.java

@@ -24,18 +24,21 @@ import com.intellij.uiDesigner.CaptionSelection;
 import com.intellij.uiDesigner.FormEditingUtil;
 import com.intellij.uiDesigner.designSurface.GuiEditor;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
 
 /**
  * @author yole
  */
 public abstract class RowColumnAction extends AnAction {
   private final String myColumnText;
-  private final String myColumnIcon;
+  private final Icon myColumnIcon;
   private final String myRowText;
-  private final String myRowIcon;
+  private final Icon myRowIcon;
 
-  public RowColumnAction(final String columnText, @NonNls final String columnIcon,
-                         final String rowText, @NonNls final String rowIcon) {
+  public RowColumnAction(final String columnText, @Nullable final Icon columnIcon,
+                         final String rowText, @Nullable final Icon rowIcon) {
     myColumnText = columnText;
     myColumnIcon = columnIcon;
     myRowText = rowText;
@@ -66,13 +69,13 @@ public abstract class RowColumnAction extends AnAction {
       if (!selection.isRow()) {
         presentation.setText(myColumnText);
         if (myColumnIcon != null) {
-          presentation.setIcon(IconLoader.getIcon(myColumnIcon));
+          presentation.setIcon(myColumnIcon);
         }
       }
       else {
         presentation.setText(myRowText);
         if (myRowIcon != null) {
-          presentation.setIcon(IconLoader.getIcon(myRowIcon));
+          presentation.setIcon(myRowIcon);
         }
       }
     }

plugins/ui-designer/src/com/intellij/uiDesigner/actions/SplitAction.java

@@ -19,14 +19,15 @@ package com.intellij.uiDesigner.actions;
 import com.intellij.uiDesigner.CaptionSelection;
 import com.intellij.uiDesigner.GridChangeUtil;
 import com.intellij.uiDesigner.UIDesignerBundle;
+import icons.UIDesignerIcons;
 
 /**
  * @author yole
 */
 public final class SplitAction extends RowColumnAction {
   public SplitAction() {
-    super(UIDesignerBundle.message("action.split.column"), "/com/intellij/uiDesigner/icons/splitColumn.png",
-          UIDesignerBundle.message("action.split.row"), "/com/intellij/uiDesigner/icons/splitRow.png");
+    super(UIDesignerBundle.message("action.split.column"), UIDesignerIcons.SplitColumn,
+          UIDesignerBundle.message("action.split.row"), UIDesignerIcons.SplitRow);
   }
 
   protected void actionPerformed(CaptionSelection selection) {

plugins/ui-designer/src/com/intellij/uiDesigner/icons/icon-robots.txt

@@ -0,0 +1,28 @@
+# These icons are mentioned in Palette2.xml
+used: button.png
+used: checkBox.png
+used: comboBox.png
+used: editorPane.png
+used: formattedTextField.png
+used: hspacer.png
+used: label.png
+used: list.png
+used: panel.png
+used: passwordField.png
+used: progressbar.png
+used: radioButton.png
+used: scrollPane.png
+used: scrollbar.png
+used: separator.png
+used: slider.png
+used: spinner.png
+used: splitPane.png
+used: tabbedPane.png
+used: table.png
+used: textArea.png
+used: textField.png
+used: textPane.png
+used: toolbar.png
+used: toolbarSeparator.png
+used: tree.png
+used: vspacer.png

plugins/ui-designer/src/icons/UIDesignerIcons.java

@@ -14,63 +14,109 @@ public class UIDesignerIcons {
   }
 
   public static final Icon Break = load("/com/intellij/uiDesigner/icons/break.png"); // 18x18
+  
+  @SuppressWarnings("unused")
   public static final Icon Button = load("/com/intellij/uiDesigner/icons/button.png"); // 16x16
   public static final Icon ButtonGroup = load("/com/intellij/uiDesigner/icons/buttonGroup.png"); // 16x16
+  
+  @SuppressWarnings("unused")
   public static final Icon CheckBox = load("/com/intellij/uiDesigner/icons/checkBox.png"); // 16x16
   public static final Icon ChooseLocale = load("/com/intellij/uiDesigner/icons/chooseLocale.png"); // 16x16
   public static final Icon CollapseNode = load("/com/intellij/uiDesigner/icons/collapseNode.png"); // 9x9
+  
+  @SuppressWarnings("unused")
   public static final Icon ComboBox = load("/com/intellij/uiDesigner/icons/comboBox.png"); // 16x16
   public static final Icon DataBindingWizard = load("/com/intellij/uiDesigner/icons/dataBindingWizard.png"); // 16x16
   public static final Icon Delete = load("/com/intellij/uiDesigner/icons/delete.png"); // 18x18
   public static final Icon DeleteCell = load("/com/intellij/uiDesigner/icons/deleteCell.png"); // 7x7
   public static final Icon Drag = load("/com/intellij/uiDesigner/icons/drag.png"); // 11x11
+  
+  @SuppressWarnings("unused")
   public static final Icon EditorPane = load("/com/intellij/uiDesigner/icons/editorPane.png"); // 16x16
   public static final Icon Empty = load("/com/intellij/uiDesigner/icons/empty.png"); // 16x16
   public static final Icon Error_small = load("/com/intellij/uiDesigner/icons/error-small.png"); // 16x16
   public static final Icon ExpandNode = load("/com/intellij/uiDesigner/icons/expandNode.png"); // 9x9
+  
+  @SuppressWarnings("unused")
   public static final Icon FormattedTextField = load("/com/intellij/uiDesigner/icons/formattedTextField.png"); // 16x16
   public static final Icon Grid = load("/com/intellij/uiDesigner/icons/grid.png"); // 18x18
   public static final Icon Horizontal = load("/com/intellij/uiDesigner/icons/horizontal.png"); // 18x18
+  
+  @SuppressWarnings("unused")
   public static final Icon Hspacer = load("/com/intellij/uiDesigner/icons/hspacer.png"); // 16x16
   public static final Icon InsertColumnLeft = load("/com/intellij/uiDesigner/icons/insertColumnLeft.png"); // 7x7
   public static final Icon InsertColumnRight = load("/com/intellij/uiDesigner/icons/insertColumnRight.png"); // 7x7
   public static final Icon InsertRowAbove = load("/com/intellij/uiDesigner/icons/insertRowAbove.png"); // 7x7
   public static final Icon InsertRowBelow = load("/com/intellij/uiDesigner/icons/insertRowBelow.png"); // 7x7
   public static final Icon InspectionSuppression = load("/com/intellij/uiDesigner/icons/inspectionSuppression.png"); // 16x16
-  public static final Icon InvalidItemAction = load("/com/intellij/uiDesigner/icons/invalidItemAction.png"); // 18x18
+  
+  @SuppressWarnings("unused")
   public static final Icon Label = load("/com/intellij/uiDesigner/icons/label.png"); // 16x16
+  
+  @SuppressWarnings("unused")
   public static final Icon List = load("/com/intellij/uiDesigner/icons/list.png"); // 16x16
   public static final Icon Listener = load("/com/intellij/uiDesigner/icons/listener.png"); // 16x16
-  public static final Icon MergeDown = load("/com/intellij/uiDesigner/icons/mergeDown.png"); // 9x9
-  public static final Icon MergeLeft = load("/com/intellij/uiDesigner/icons/mergeLeft.png"); // 9x9
-  public static final Icon MergeRight = load("/com/intellij/uiDesigner/icons/mergeRight.png"); // 9x9
-  public static final Icon MergeUp = load("/com/intellij/uiDesigner/icons/mergeUp.png"); // 9x9
+  
+  @SuppressWarnings("unused")
   public static final Icon Panel = load("/com/intellij/uiDesigner/icons/panel.png"); // 16x16
+  
+  @SuppressWarnings("unused")
   public static final Icon PasswordField = load("/com/intellij/uiDesigner/icons/passwordField.png"); // 16x16
-  public static final Icon Pointer = load("/com/intellij/uiDesigner/icons/pointer.png"); // 18x18
+  
+  @SuppressWarnings("unused")
   public static final Icon Progressbar = load("/com/intellij/uiDesigner/icons/progressbar.png"); // 16x16
-  public static final Icon RadioButton_small = load("/com/intellij/uiDesigner/icons/radioButton-small.png"); // 18x18
+  
+  @SuppressWarnings("unused")
   public static final Icon RadioButton = load("/com/intellij/uiDesigner/icons/radioButton.png"); // 16x16
+  
+  @SuppressWarnings("unused")
   public static final Icon Scrollbar = load("/com/intellij/uiDesigner/icons/scrollbar.png"); // 16x16
+  
+  @SuppressWarnings("unused")
   public static final Icon ScrollPane = load("/com/intellij/uiDesigner/icons/scrollPane.png"); // 18x18
+  
+  @SuppressWarnings("unused")
   public static final Icon Separator = load("/com/intellij/uiDesigner/icons/separator.png"); // 16x16
-  public static final Icon ShowPopup = load("/com/intellij/uiDesigner/icons/showPopup.png"); // 7x7
+  
+  @SuppressWarnings("unused")
   public static final Icon Slider = load("/com/intellij/uiDesigner/icons/slider.png"); // 16x16
+  
+  @SuppressWarnings("unused")
   public static final Icon Spinner = load("/com/intellij/uiDesigner/icons/spinner.png"); // 16x16
   public static final Icon SplitColumn = load("/com/intellij/uiDesigner/icons/splitColumn.png"); // 7x7
+  
+  @SuppressWarnings("unused")
   public static final Icon SplitPane = load("/com/intellij/uiDesigner/icons/splitPane.png"); // 16x16
   public static final Icon SplitRow = load("/com/intellij/uiDesigner/icons/splitRow.png"); // 7x7
+  
+  @SuppressWarnings("unused")
   public static final Icon TabbedPane = load("/com/intellij/uiDesigner/icons/tabbedPane.png"); // 16x16
+  
+  @SuppressWarnings("unused")
   public static final Icon Table = load("/com/intellij/uiDesigner/icons/table.png"); // 16x16
+  
+  @SuppressWarnings("unused")
   public static final Icon TextArea = load("/com/intellij/uiDesigner/icons/textArea.png"); // 16x16
+  
+  @SuppressWarnings("unused")
   public static final Icon TextField = load("/com/intellij/uiDesigner/icons/textField.png"); // 16x16
+  
+  @SuppressWarnings("unused")
   public static final Icon TextPane = load("/com/intellij/uiDesigner/icons/textPane.png"); // 16x16
+  
+  @SuppressWarnings("unused")
   public static final Icon Toolbar = load("/com/intellij/uiDesigner/icons/toolbar.png"); // 16x16
+  
+  @SuppressWarnings("unused")
   public static final Icon ToolbarSeparator = load("/com/intellij/uiDesigner/icons/toolbarSeparator.png"); // 16x16
   public static final Icon ToolWindowUIDesigner = load("/com/intellij/uiDesigner/icons/toolWindowUIDesigner.png"); // 13x13
+  
+  @SuppressWarnings("unused")
   public static final Icon Tree = load("/com/intellij/uiDesigner/icons/tree.png"); // 16x16
   public static final Icon Unknown_small = load("/com/intellij/uiDesigner/icons/unknown-small.png"); // 16x16
   public static final Icon Unknown = load("/com/intellij/uiDesigner/icons/unknown.png"); // 18x18
   public static final Icon Vertical = load("/com/intellij/uiDesigner/icons/vertical.png"); // 18x18
+  
+  @SuppressWarnings("unused")
   public static final Icon Vspacer = load("/com/intellij/uiDesigner/icons/vspacer.png"); // 16x16
 }

plugins/xpath/xpath-lang/src/icons/XpathIcons.java

@@ -14,7 +14,6 @@ public class XpathIcons {
   }
 
   public static final Icon Association = load("/icons/association.png"); // 16x16
-  public static final Icon Association_large = load("/icons/association_large.png"); // 32x32
   public static final Icon Association_small = load("/icons/association_small.png"); // 11x11
   public static final Icon Function = load("/icons/function.png"); // 18x18
   public static final Icon Namespace = load("/icons/namespace.png"); // 21x21
@@ -24,5 +23,4 @@ public class XpathIcons {
   public static final Icon Xslt_filetype_overlay = load("/icons/xslt-filetype-overlay.png"); // 11x16
   public static final Icon Xslt = load("/icons/xslt.png"); // 16x16
   public static final Icon Xml = load("/icons/xml.png"); // 20x20
-  public static final Icon Xml_big = load("/icons/xml_big.png"); // 28x31
 }