diff --git a/plugins/IntentionPowerPak/src/icons/IntentionPowerPackPluginIcons.java b/plugins/IntentionPowerPak/src/icons/IntentionPowerPackPluginIcons.java deleted file mode 100644 index 9e50a7cd4b31..000000000000 --- a/plugins/IntentionPowerPak/src/icons/IntentionPowerPackPluginIcons.java +++ /dev/null @@ -1,18 +0,0 @@ -package icons; - -import com.intellij.openapi.util.IconLoader; - -import javax.swing.*; - -/** - * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant - * Don't repeat mistakes of others ;-) - */ -public class IntentionPowerPackPluginIcons { - private static Icon load(String path) { - return IconLoader.getIcon(path, IntentionPowerPackPluginIcons.class); - } - - public static final Icon IPPIcon = load("/IPPIcon.png"); // 32x32 - public static final Icon IPPIconold = load("/IPPIconold.png"); // 32x32 -} diff --git a/plugins/groovy/resources/icons/groovy/ant.png b/plugins/groovy/resources/icons/groovy/ant.png deleted file mode 100644 index cdbcfa28324c..000000000000 Binary files a/plugins/groovy/resources/icons/groovy/ant.png and /dev/null differ diff --git a/plugins/groovy/resources/icons/groovy/gant_task.png b/plugins/groovy/resources/icons/groovy/gant_task.png deleted file mode 100644 index df29a108e48d..000000000000 Binary files a/plugins/groovy/resources/icons/groovy/gant_task.png and /dev/null differ diff --git a/plugins/groovy/resources/icons/groovy/groovy_18x18.png b/plugins/groovy/resources/icons/groovy/groovy_18x18.png deleted file mode 100644 index 5ab5d44a2791..000000000000 Binary files a/plugins/groovy/resources/icons/groovy/groovy_18x18.png and /dev/null differ diff --git a/plugins/groovy/resources/icons/groovy/groovy_24x24.png b/plugins/groovy/resources/icons/groovy/groovy_24x24.png deleted file mode 100644 index e502dba2bb4f..000000000000 Binary files a/plugins/groovy/resources/icons/groovy/groovy_24x24.png and /dev/null differ diff --git a/plugins/groovy/resources/icons/groovy/groovy_32x32.png b/plugins/groovy/resources/icons/groovy/groovy_32x32.png deleted file mode 100644 index 456b9307783a..000000000000 Binary files a/plugins/groovy/resources/icons/groovy/groovy_32x32.png and /dev/null differ diff --git a/plugins/groovy/resources/icons/groovy/groovy_48x48.png b/plugins/groovy/resources/icons/groovy/groovy_48x48.png deleted file mode 100644 index 49c56a0bbbba..000000000000 Binary files a/plugins/groovy/resources/icons/groovy/groovy_48x48.png and /dev/null differ diff --git a/plugins/groovy/resources/icons/groovy/groovy_64x64.png b/plugins/groovy/resources/icons/groovy/groovy_64x64.png deleted file mode 100644 index 60bf2d6d0dc1..000000000000 Binary files a/plugins/groovy/resources/icons/groovy/groovy_64x64.png and /dev/null differ diff --git a/plugins/groovy/resources/icons/groovy/groovy_fileType.png b/plugins/groovy/resources/icons/groovy/groovy_fileType.png deleted file mode 100644 index 5ab5d44a2791..000000000000 Binary files a/plugins/groovy/resources/icons/groovy/groovy_fileType.png and /dev/null differ diff --git a/plugins/groovy/resources/icons/groovy/groovy_sdk.png b/plugins/groovy/resources/icons/groovy/groovy_sdk.png deleted file mode 100644 index c2290a7a47f8..000000000000 Binary files a/plugins/groovy/resources/icons/groovy/groovy_sdk.png and /dev/null differ diff --git a/plugins/groovy/resources/icons/groovy/no_gant_sdk.png b/plugins/groovy/resources/icons/groovy/no_gant_sdk.png deleted file mode 100644 index c4be8098528d..000000000000 Binary files a/plugins/groovy/resources/icons/groovy/no_gant_sdk.png and /dev/null differ diff --git a/plugins/groovy/resources/icons/groovy/no_groovy_sdk.png b/plugins/groovy/resources/icons/groovy/no_groovy_sdk.png deleted file mode 100644 index 1d9f3e0c63f3..000000000000 Binary files a/plugins/groovy/resources/icons/groovy/no_groovy_sdk.png and /dev/null differ diff --git a/plugins/groovy/resources/icons/groovy/static.png b/plugins/groovy/resources/icons/groovy/static.png deleted file mode 100644 index b1e3d58ed100..000000000000 Binary files a/plugins/groovy/resources/icons/groovy/static.png and /dev/null differ diff --git a/plugins/maven/src/main/resources/images/attachPlugin.png b/plugins/maven/src/main/resources/images/attachPlugin.png deleted file mode 100644 index 32524959b4ae..000000000000 Binary files a/plugins/maven/src/main/resources/images/attachPlugin.png and /dev/null differ diff --git a/plugins/maven/src/main/resources/images/detachPlugin.png b/plugins/maven/src/main/resources/images/detachPlugin.png deleted file mode 100644 index 432e95be89a4..000000000000 Binary files a/plugins/maven/src/main/resources/images/detachPlugin.png and /dev/null differ diff --git a/plugins/maven/src/main/resources/images/icon-robots.txt b/plugins/maven/src/main/resources/images/icon-robots.txt new file mode 100644 index 000000000000..2f57daa53eec --- /dev/null +++ b/plugins/maven/src/main/resources/images/icon-robots.txt @@ -0,0 +1,2 @@ +# error.png is used in MavenProjectsStructure +used: error.png diff --git a/plugins/maven/src/main/resources/images/mavenSettings.png b/plugins/maven/src/main/resources/images/mavenSettings.png deleted file mode 100644 index bef176a3c0c7..000000000000 Binary files a/plugins/maven/src/main/resources/images/mavenSettings.png and /dev/null differ diff --git a/plugins/maven/src/main/resources/images/modulesOpen.png b/plugins/maven/src/main/resources/images/modulesOpen.png deleted file mode 100644 index f8ef0b24a076..000000000000 Binary files a/plugins/maven/src/main/resources/images/modulesOpen.png and /dev/null differ diff --git a/plugins/maven/src/main/resources/images/phasesOpen.png b/plugins/maven/src/main/resources/images/phasesOpen.png deleted file mode 100644 index b30fe72f4528..000000000000 Binary files a/plugins/maven/src/main/resources/images/phasesOpen.png and /dev/null differ diff --git a/plugins/maven/src/main/resources/images/profilesOpen.png b/plugins/maven/src/main/resources/images/profilesOpen.png deleted file mode 100644 index 5c094b42553f..000000000000 Binary files a/plugins/maven/src/main/resources/images/profilesOpen.png and /dev/null differ diff --git a/plugins/maven/src/main/resources/images/repository.png b/plugins/maven/src/main/resources/images/repository.png deleted file mode 100644 index b1734d7ba5fa..000000000000 Binary files a/plugins/maven/src/main/resources/images/repository.png and /dev/null differ diff --git a/plugins/maven/src/main/resources/images/updateDependencies.png b/plugins/maven/src/main/resources/images/updateDependencies.png deleted file mode 100644 index 885c0be5a1c2..000000000000 Binary files a/plugins/maven/src/main/resources/images/updateDependencies.png and /dev/null differ diff --git a/plugins/maven/src/main/resources/images/updateIndices.png b/plugins/maven/src/main/resources/images/updateIndices.png deleted file mode 100644 index 5955277b66e8..000000000000 Binary files a/plugins/maven/src/main/resources/images/updateIndices.png and /dev/null differ diff --git a/plugins/maven/src/main/resources/images/warning.png b/plugins/maven/src/main/resources/images/warning.png deleted file mode 100644 index 6697c2f06558..000000000000 Binary files a/plugins/maven/src/main/resources/images/warning.png and /dev/null differ diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/AcceptWordAsCorrect.java b/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/AcceptWordAsCorrect.java index bfdc45ff6c62..dd47b0c3d591 100644 --- a/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/AcceptWordAsCorrect.java +++ b/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/AcceptWordAsCorrect.java @@ -21,6 +21,7 @@ import com.intellij.openapi.actionSystem.Anchor; import com.intellij.openapi.project.Project; import com.intellij.spellchecker.SpellCheckerManager; import com.intellij.spellchecker.util.SpellCheckerBundle; +import icons.SpellcheckerIcons; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -61,6 +62,6 @@ public class AcceptWordAsCorrect implements SpellCheckerQuickFix { } public Icon getIcon(int flags) { - return new ImageIcon(ShowSuggestions.class.getResource("spellcheck.png")); + return SpellcheckerIcons.Spellcheck; } } diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/ShowSuggestions.java b/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/ShowSuggestions.java index 204502aa8a7c..463b59ac1c01 100644 --- a/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/ShowSuggestions.java +++ b/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/ShowSuggestions.java @@ -19,6 +19,7 @@ import com.intellij.codeInspection.LocalQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Iconable; import com.intellij.spellchecker.SpellCheckerManager; +import icons.SpellcheckerIcons; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -46,6 +47,6 @@ public abstract class ShowSuggestions implements LocalQuickFix, Iconable { } public Icon getIcon(int flags) { - return new ImageIcon(ShowSuggestions.class.getResource("spellcheck.png")); + return SpellcheckerIcons.Spellcheck; } } diff --git a/plugins/spellchecker/src/icons/SpellcheckerIcons.java b/plugins/spellchecker/src/icons/SpellcheckerIcons.java index c058647dc545..a2f51d4fde63 100644 --- a/plugins/spellchecker/src/icons/SpellcheckerIcons.java +++ b/plugins/spellchecker/src/icons/SpellcheckerIcons.java @@ -13,5 +13,5 @@ public class SpellcheckerIcons { return IconLoader.getIcon(path, SpellcheckerIcons.class); } - public static final Icon Spellcheck = load("/com/intellij/spellchecker/quickfixes/spellcheck.png"); // 16x16 + public static final Icon Spellcheck = load("/icons/spellcheck.png"); // 16x16 } diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/spellcheck.png b/plugins/spellchecker/src/icons/spellcheck.png similarity index 100% rename from plugins/spellchecker/src/com/intellij/spellchecker/quickfixes/spellcheck.png rename to plugins/spellchecker/src/icons/spellcheck.png diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/ConflictState.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/ConflictState.java index 1ae65c26dab0..cb5ba00539c2 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/ConflictState.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/ConflictState.java @@ -15,20 +15,20 @@ */ package org.jetbrains.idea.svn; -import com.intellij.openapi.util.IconLoader; +import icons.Svn4ideaIcons; import org.jetbrains.annotations.Nullable; import javax.swing.*; public enum ConflictState { none(false, false, false, null), - tree(true, false, false, "/icons/conflictc.png"), - text(false, true, false, "/icons/conflictt.png"), - prop(false, false, true, "/icons/conflictp.png"), - tree_text(true, true, false, "/icons/conflictct.png"), // ? - - tree_prop(true, false, true, "/icons/conflictcp.png"), // now falls but marked - text_prop(false, true, true, "/icons/conflicttp.png"), - all3(true, true, true, "/icons/conflictctp.png"); // ? - + tree(true, false, false, Svn4ideaIcons.Conflictc), + text(false, true, false, Svn4ideaIcons.Conflictt), + prop(false, false, true, Svn4ideaIcons.Conflictp), + tree_text(true, true, false, Svn4ideaIcons.Conflictct), // ? - + tree_prop(true, false, true, Svn4ideaIcons.Conflictcp), // now falls but marked + text_prop(false, true, true, Svn4ideaIcons.Conflicttp), + all3(true, true, true, Svn4ideaIcons.Conflictctp); // ? - private final boolean myTree; private final boolean myText; @@ -37,16 +37,12 @@ public enum ConflictState { private final Icon myIcon; private final String myDescription; - private ConflictState(final boolean tree, final boolean text, final boolean property, final String iconPath) { + ConflictState(final boolean tree, final boolean text, final boolean property, @Nullable final Icon icon) { myTree = tree; myText = text; myProperty = property; - if (iconPath != null) { - myIcon = IconLoader.getIcon(iconPath); - } else { - myIcon = null; - } + myIcon = icon; myDescription = createDescription(); } @@ -64,7 +60,7 @@ public enum ConflictState { return sb.toString(); } - private int checkOne(final boolean value, final int init, final StringBuilder sb, final String text) { + private static int checkOne(final boolean value, final int init, final StringBuilder sb, final String text) { if (value) { if (sb.length() > 0) { sb.append(", "); diff --git a/plugins/tasks/tasks-core/src/icons/TasksCoreIcons.java b/plugins/tasks/tasks-core/src/icons/TasksCoreIcons.java index 3dada66bf858..ce89879278cb 100644 --- a/plugins/tasks/tasks-core/src/icons/TasksCoreIcons.java +++ b/plugins/tasks/tasks-core/src/icons/TasksCoreIcons.java @@ -20,7 +20,6 @@ public class TasksCoreIcons { public static final Icon Github = load("/icons/github.png"); // 16x16 public static final Icon Lighthouse = load("/icons/lighthouse.gif"); // 16x16 public static final Icon Mantis = load("/icons/mantis.png"); // 16x16 - public static final Icon Navigate = load("/icons/navigate.png"); // 16x16 public static final Icon Other = load("/icons/other.png"); // 16x16 public static class Pivotal { @@ -32,10 +31,8 @@ public class TasksCoreIcons { } public static final Icon Pivotal = load("/icons/pivotal.png"); // 16x16 public static final Icon Redmine = load("/icons/redmine.png"); // 16x16 - public static final Icon Save = load("/icons/save.png"); // 16x16 public static final Icon SavedContext = load("/icons/savedContext.png"); // 16x16 public static final Icon Trac = load("/icons/trac.png"); // 16x16 public static final Icon Unknown = load("/icons/unknown.png"); // 16x16 - public static final Icon Web = load("/icons/web.png"); // 16x16 public static final Icon Youtrack = load("/icons/youtrack.png"); // 16x16 } diff --git a/plugins/ui-designer/src/icons/UIDesignerIcons.java b/plugins/ui-designer/src/icons/UIDesignerIcons.java index 84608fd69909..c5699b80a6ac 100644 --- a/plugins/ui-designer/src/icons/UIDesignerIcons.java +++ b/plugins/ui-designer/src/icons/UIDesignerIcons.java @@ -13,7 +13,6 @@ public class UIDesignerIcons { return IconLoader.getIcon(path, UIDesignerIcons.class); } - 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 @@ -27,7 +26,6 @@ public class UIDesignerIcons { @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 @@ -39,8 +37,6 @@ public class UIDesignerIcons { @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 @@ -115,7 +111,6 @@ public class UIDesignerIcons { 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