diff --git a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java index f467bdd65e5b..b38672b9eed9 100644 --- a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java +++ b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java @@ -66,11 +66,6 @@ public class JavaModuleType extends ModuleType { return ProjectBundle.message("module.type.java.description"); } - @Override - public Icon getBigIcon() { - return getJavaModuleIcon(); - } - @Override public Icon getNodeIcon(boolean isOpened) { return getJavaModuleNodeIconClosed(); @@ -83,10 +78,6 @@ public class JavaModuleType extends ModuleType { moduleBuilder::isSuitableSdkType); } - private static Icon getJavaModuleIcon() { - return AllIcons.Modules.Types.JavaModule; - } - private static Icon getJavaModuleNodeIconClosed() { return AllIcons.Nodes.Module; } diff --git a/java/remote-servers/impl/src/com/intellij/remoteServer/impl/module/CloudModuleBuilder.java b/java/remote-servers/impl/src/com/intellij/remoteServer/impl/module/CloudModuleBuilder.java index ccdd58df54d6..17bc78da557c 100644 --- a/java/remote-servers/impl/src/com/intellij/remoteServer/impl/module/CloudModuleBuilder.java +++ b/java/remote-servers/impl/src/com/intellij/remoteServer/impl/module/CloudModuleBuilder.java @@ -73,11 +73,6 @@ public class CloudModuleBuilder extends JavaModuleBuilder { return getClass().getName(); } - @Override - public Icon getBigIcon() { - return AllIcons.General.Balloon; - } - @Override public Icon getNodeIcon() { return AllIcons.General.Balloon; diff --git a/platform/icons/src/modules/types/JavaeeAppModule.png b/platform/icons/src/modules/types/JavaeeAppModule.png deleted file mode 100644 index 9d27a8e4d28e..000000000000 Binary files a/platform/icons/src/modules/types/JavaeeAppModule.png and /dev/null differ diff --git a/platform/icons/src/modules/types/JavaeeAppModule@2x.png b/platform/icons/src/modules/types/JavaeeAppModule@2x.png deleted file mode 100644 index 5d7ac6b866f2..000000000000 Binary files a/platform/icons/src/modules/types/JavaeeAppModule@2x.png and /dev/null differ diff --git a/platform/icons/src/modules/types/JavaeeAppModule@2x_dark.png b/platform/icons/src/modules/types/JavaeeAppModule@2x_dark.png deleted file mode 100644 index 09f394c18070..000000000000 Binary files a/platform/icons/src/modules/types/JavaeeAppModule@2x_dark.png and /dev/null differ diff --git a/platform/icons/src/modules/types/JavaeeAppModule_dark.png b/platform/icons/src/modules/types/JavaeeAppModule_dark.png deleted file mode 100644 index 1a442266005b..000000000000 Binary files a/platform/icons/src/modules/types/JavaeeAppModule_dark.png and /dev/null differ diff --git a/platform/icons/src/modules/types/ejbModule.png b/platform/icons/src/modules/types/ejbModule.png deleted file mode 100644 index 356156c24ae4..000000000000 Binary files a/platform/icons/src/modules/types/ejbModule.png and /dev/null differ diff --git a/platform/icons/src/modules/types/ejbModule@2x.png b/platform/icons/src/modules/types/ejbModule@2x.png deleted file mode 100644 index 007808d6611d..000000000000 Binary files a/platform/icons/src/modules/types/ejbModule@2x.png and /dev/null differ diff --git a/platform/icons/src/modules/types/emptyProjectType.png b/platform/icons/src/modules/types/emptyProjectType.png deleted file mode 100644 index 639ad5701228..000000000000 Binary files a/platform/icons/src/modules/types/emptyProjectType.png and /dev/null differ diff --git a/platform/icons/src/modules/types/emptyProjectType@2x.png b/platform/icons/src/modules/types/emptyProjectType@2x.png deleted file mode 100644 index c3ef948ce63a..000000000000 Binary files a/platform/icons/src/modules/types/emptyProjectType@2x.png and /dev/null differ diff --git a/platform/icons/src/modules/types/javaModule.png b/platform/icons/src/modules/types/javaModule.png deleted file mode 100644 index 1c294793adb8..000000000000 Binary files a/platform/icons/src/modules/types/javaModule.png and /dev/null differ diff --git a/platform/icons/src/modules/types/javaModule@2x.png b/platform/icons/src/modules/types/javaModule@2x.png deleted file mode 100644 index 4ebbd7467594..000000000000 Binary files a/platform/icons/src/modules/types/javaModule@2x.png and /dev/null differ diff --git a/platform/icons/src/modules/types/pluginModule.png b/platform/icons/src/modules/types/pluginModule.png deleted file mode 100644 index 244bd2c09b50..000000000000 Binary files a/platform/icons/src/modules/types/pluginModule.png and /dev/null differ diff --git a/platform/icons/src/modules/types/pluginModule@2x.png b/platform/icons/src/modules/types/pluginModule@2x.png deleted file mode 100644 index c166d910d288..000000000000 Binary files a/platform/icons/src/modules/types/pluginModule@2x.png and /dev/null differ diff --git a/platform/icons/src/modules/types/pluginModule@2x_dark.png b/platform/icons/src/modules/types/pluginModule@2x_dark.png deleted file mode 100644 index d4048c7dbf0f..000000000000 Binary files a/platform/icons/src/modules/types/pluginModule@2x_dark.png and /dev/null differ diff --git a/platform/icons/src/modules/types/pluginModule_dark.png b/platform/icons/src/modules/types/pluginModule_dark.png deleted file mode 100644 index e2525561f623..000000000000 Binary files a/platform/icons/src/modules/types/pluginModule_dark.png and /dev/null differ diff --git a/platform/icons/src/modules/types/webModule.png b/platform/icons/src/modules/types/webModule.png deleted file mode 100644 index 528314e5ed49..000000000000 Binary files a/platform/icons/src/modules/types/webModule.png and /dev/null differ diff --git a/platform/icons/src/modules/types/webModule@2x.png b/platform/icons/src/modules/types/webModule@2x.png deleted file mode 100644 index 1687d667ff36..000000000000 Binary files a/platform/icons/src/modules/types/webModule@2x.png and /dev/null differ diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java index 4f9c930af817..113720bbebd8 100644 --- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java +++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java @@ -344,10 +344,6 @@ public abstract class ModuleBuilder extends AbstractModuleBuilder { return null; } - public Icon getBigIcon() { - return getModuleType().getBigIcon(); - } - public Icon getNodeIcon() { return getModuleType().getNodeIcon(false); } diff --git a/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java b/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java index 643cab16cc1d..dd1079b8b5ef 100644 --- a/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java +++ b/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java @@ -48,7 +48,6 @@ public abstract class ModuleType { public abstract String getName(); @NotNull public abstract String getDescription(); - public abstract Icon getBigIcon(); public Icon getIcon() { return getNodeIcon(false); diff --git a/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java b/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java index 654705c1f3cd..001e901f9f81 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java @@ -58,11 +58,6 @@ public class EmptyModuleType extends ModuleType { return ProjectBundle.message("module.type.empty.description"); } - @Override - public Icon getBigIcon() { - return AllIcons.Modules.Types.EmptyProjectType; - } - @Override public Icon getNodeIcon(boolean isOpened) { return AllIcons.Nodes.Module; diff --git a/platform/lang-impl/src/com/intellij/openapi/module/UnknownModuleType.java b/platform/lang-impl/src/com/intellij/openapi/module/UnknownModuleType.java index 9c312618dd8d..0f581e969830 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/UnknownModuleType.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/UnknownModuleType.java @@ -51,11 +51,6 @@ public class UnknownModuleType extends ModuleType { return myModuleType.getDescription(); } - @Override - public Icon getBigIcon() { - return myModuleType.getBigIcon(); - } - @Override public Icon getNodeIcon(boolean isOpened) { return myModuleType.getIcon(); diff --git a/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java b/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java index 7b9328a65a56..1ef777298e8b 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java @@ -45,11 +45,6 @@ public abstract class WebModuleTypeBase extends ModuleT return ProjectBundle.message("module.web.description"); } - @Override - public Icon getBigIcon() { - return AllIcons.Modules.Types.WebModule; - } - @Override public Icon getNodeIcon(final boolean isOpened) { return AllIcons.Nodes.Module; diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 48e0411bcedf..fd75c45118fa 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -821,13 +821,7 @@ public class AllIcons { public static final Icon TestSourceFolder = IconLoader.getIcon("/modules/testSourceFolder.png"); // 16x16 public static class Types { - public static final Icon EjbModule = IconLoader.getIcon("/modules/types/ejbModule.png"); // 24x24 - public static final Icon EmptyProjectType = IconLoader.getIcon("/modules/types/emptyProjectType.png"); // 24x24 - public static final Icon JavaeeAppModule = IconLoader.getIcon("/modules/types/JavaeeAppModule.png"); // 24x24 - public static final Icon JavaModule = IconLoader.getIcon("/modules/types/javaModule.png"); // 24x24 - public static final Icon PluginModule = IconLoader.getIcon("/modules/types/pluginModule.png"); // 24x24 public static final Icon UserDefined = IconLoader.getIcon("/modules/types/userDefined.png"); // 16x16 - public static final Icon WebModule = IconLoader.getIcon("/modules/types/webModule.png"); // 24x24 } public static final Icon UnmarkWebroot = IconLoader.getIcon("/modules/unmarkWebroot.png"); // 16x16 diff --git a/plugins/devkit/src/module/PluginModuleType.java b/plugins/devkit/src/module/PluginModuleType.java index 689a9bd3b5d7..b2a4f2986d1b 100644 --- a/plugins/devkit/src/module/PluginModuleType.java +++ b/plugins/devkit/src/module/PluginModuleType.java @@ -67,10 +67,6 @@ public class PluginModuleType extends ModuleType { return DevKitBundle.message("module.description"); } - public Icon getBigIcon() { - return AllIcons.Modules.Types.PluginModule; - } - public Icon getNodeIcon(boolean isOpened) { return AllIcons.Nodes.Plugin; } diff --git a/plugins/groovy/groovy-psi/gen/icons/JetgroovyIcons.java b/plugins/groovy/groovy-psi/gen/icons/JetgroovyIcons.java index ce3925191d82..cbb29a97011a 100644 --- a/plugins/groovy/groovy-psi/gen/icons/JetgroovyIcons.java +++ b/plugins/groovy/groovy-psi/gen/icons/JetgroovyIcons.java @@ -30,7 +30,6 @@ public class JetgroovyIcons { public static class Griffon { - public static final Icon Griffon_icon_24x24 = load("/icons/griffon/griffon-icon-24x24.png"); // 24x24 public static final Icon Griffon = load("/icons/griffon/griffon.png"); // 16x16 public static final Icon GriffonToolWindow = load("/icons/griffon/griffonToolWindow.png"); // 13x13 @@ -58,7 +57,6 @@ public class JetgroovyIcons { public static final Icon Groovy_outsideSources = load("/icons/groovy/groovy_outsideSources.png"); // 16x16 public static final Icon GroovyDoc = load("/icons/groovy/GroovyDoc.png"); // 16x16 public static final Icon GroovyFile = load("/icons/groovy/groovyFile.png"); // 16x16 - public static final Icon GroovyModule = load("/icons/groovy/groovyModule.png"); // 24x24 public static final Icon Interface = load("/icons/groovy/interface.png"); // 16x16 public static final Icon Method = load("/icons/groovy/method.png"); // 16x16 public static final Icon Property = load("/icons/groovy/property.png"); // 16x16 diff --git a/plugins/groovy/groovy-psi/resources/icons/griffon/griffon-icon-24x24.png b/plugins/groovy/groovy-psi/resources/icons/griffon/griffon-icon-24x24.png deleted file mode 100644 index 79d5eb8e6b35..000000000000 Binary files a/plugins/groovy/groovy-psi/resources/icons/griffon/griffon-icon-24x24.png and /dev/null differ diff --git a/plugins/groovy/groovy-psi/resources/icons/griffon/griffon-icon-24x24@2x.png b/plugins/groovy/groovy-psi/resources/icons/griffon/griffon-icon-24x24@2x.png deleted file mode 100644 index b81d1dfc35ee..000000000000 Binary files a/plugins/groovy/groovy-psi/resources/icons/griffon/griffon-icon-24x24@2x.png and /dev/null differ diff --git a/plugins/groovy/groovy-psi/resources/icons/griffon/griffon-icon-24x24@2x_dark.png b/plugins/groovy/groovy-psi/resources/icons/griffon/griffon-icon-24x24@2x_dark.png deleted file mode 100644 index ab08c716bcaf..000000000000 Binary files a/plugins/groovy/groovy-psi/resources/icons/griffon/griffon-icon-24x24@2x_dark.png and /dev/null differ diff --git a/plugins/groovy/groovy-psi/resources/icons/griffon/griffon-icon-24x24_dark.png b/plugins/groovy/groovy-psi/resources/icons/griffon/griffon-icon-24x24_dark.png deleted file mode 100644 index 1017329cdfe5..000000000000 Binary files a/plugins/groovy/groovy-psi/resources/icons/griffon/griffon-icon-24x24_dark.png and /dev/null differ diff --git a/plugins/groovy/groovy-psi/resources/icons/groovy/groovyModule.png b/plugins/groovy/groovy-psi/resources/icons/groovy/groovyModule.png deleted file mode 100644 index 3333f4d8d381..000000000000 Binary files a/plugins/groovy/groovy-psi/resources/icons/groovy/groovyModule.png and /dev/null differ diff --git a/plugins/groovy/groovy-psi/resources/icons/groovy/groovyModule@2x.png b/plugins/groovy/groovy-psi/resources/icons/groovy/groovyModule@2x.png deleted file mode 100644 index 943d68a6eb50..000000000000 Binary files a/plugins/groovy/groovy-psi/resources/icons/groovy/groovyModule@2x.png and /dev/null differ diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java index b9119d4ea921..e0239e415b96 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java @@ -35,18 +35,16 @@ public class GroovyAwareModuleBuilder extends JavaModuleBuilder { private final String myBuilderId; private final String myPresentableName; private final String myDescription; - private final Icon myBigIcon; @SuppressWarnings("UnusedDeclaration") public GroovyAwareModuleBuilder() { - this("groovy", "Groovy", "Simple module with attached Groovy library", JetgroovyIcons.Groovy.GroovyModule); + this("groovy", "Groovy", "Simple module with attached Groovy library"); } - protected GroovyAwareModuleBuilder(String builderId, String presentableName, String description, Icon bigIcon) { + protected GroovyAwareModuleBuilder(String builderId, String presentableName, String description) { myBuilderId = builderId; myPresentableName = presentableName; myDescription = description; - myBigIcon = bigIcon; } @Nullable @@ -65,11 +63,6 @@ public class GroovyAwareModuleBuilder extends JavaModuleBuilder { return myBuilderId; } - @Override - public Icon getBigIcon() { - return myBigIcon; - } - @Override public Icon getNodeIcon() { return JetgroovyIcons.Groovy.Groovy_16x16; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonModuleBuilder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonModuleBuilder.java index bde6088fced9..9887019b94d7 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonModuleBuilder.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonModuleBuilder.java @@ -10,7 +10,7 @@ import javax.swing.*; */ public class GriffonModuleBuilder extends MvcModuleBuilder { public GriffonModuleBuilder() { - super(GriffonFramework.getInstance(), JetgroovyIcons.Griffon.Griffon_icon_24x24); + super(GriffonFramework.getInstance()); } @Override diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleBuilder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleBuilder.java index 399a99d057c0..43bad9b426a2 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleBuilder.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleBuilder.java @@ -17,17 +17,15 @@ package org.jetbrains.plugins.groovy.mvc; import org.jetbrains.plugins.groovy.config.GroovyAwareModuleBuilder; -import javax.swing.*; - /** * @author peter */ public class MvcModuleBuilder extends GroovyAwareModuleBuilder { private final MvcFramework myFramework; - protected MvcModuleBuilder(MvcFramework framework, Icon bigIcon) { + protected MvcModuleBuilder(MvcFramework framework) { super(framework.getFrameworkName(), framework.getDisplayName(), - framework.getDisplayName() + " modules are used for creating " + framework.getDisplayName() + " applications.", bigIcon); + framework.getDisplayName() + " modules are used for creating " + framework.getDisplayName() + " applications."); myFramework = framework; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java index 81862156a5f2..f49629b4dee1 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java @@ -15,7 +15,6 @@ */ package org.jetbrains.idea.maven.wizards; -import com.intellij.icons.AllIcons; import com.intellij.ide.util.projectWizard.*; import com.intellij.openapi.Disposable; import com.intellij.openapi.module.JavaModuleType; @@ -116,11 +115,6 @@ public class MavenModuleBuilder extends ModuleBuilder implements SourcePathsBuil "You can create either a blank Maven module or a module based on a Maven archetype."; } - @Override - public Icon getBigIcon() { - return AllIcons.Modules.Types.JavaModule; - } - @Override public Icon getNodeIcon() { return MavenIcons.MavenLogo; diff --git a/python/gen/icons/PythonIcons.java b/python/gen/icons/PythonIcons.java index 626af4daccc1..069bd69ad9d0 100644 --- a/python/gen/icons/PythonIcons.java +++ b/python/gen/icons/PythonIcons.java @@ -67,7 +67,6 @@ public class PythonIcons { public static final Icon Pypy = load("/icons/com/jetbrains/python/pypy.png"); // 16x16 public static final Icon Python_logo = load("/icons/com/jetbrains/python/python-logo.png"); // 16x16 public static final Icon Python = load("/icons/com/jetbrains/python/python.png"); // 16x16 - public static final Icon Python_24 = load("/icons/com/jetbrains/python/python_24.png"); // 24x24 public static final Icon PythonClosed = load("/icons/com/jetbrains/python/pythonClosed.png"); // 16x16 public static final Icon PythonConsole = load("/icons/com/jetbrains/python/pythonConsole.png"); // 16x16 public static final Icon PythonConsoleToolWindow = load("/icons/com/jetbrains/python/pythonConsoleToolWindow.png"); // 13x13 diff --git a/python/resources/icons/com/jetbrains/python/python_24.png b/python/resources/icons/com/jetbrains/python/python_24.png deleted file mode 100644 index 7d724e5774a6..000000000000 Binary files a/python/resources/icons/com/jetbrains/python/python_24.png and /dev/null differ diff --git a/python/resources/icons/com/jetbrains/python/python_24@2x.png b/python/resources/icons/com/jetbrains/python/python_24@2x.png deleted file mode 100644 index 17c24a0122be..000000000000 Binary files a/python/resources/icons/com/jetbrains/python/python_24@2x.png and /dev/null differ diff --git a/python/src/com/jetbrains/python/PythonModuleTypeBase.java b/python/src/com/jetbrains/python/PythonModuleTypeBase.java index 042f11f3ef33..806880c0808f 100644 --- a/python/src/com/jetbrains/python/PythonModuleTypeBase.java +++ b/python/src/com/jetbrains/python/PythonModuleTypeBase.java @@ -59,10 +59,6 @@ public abstract class PythonModuleTypeBase extends Modu return basicDescription; } - public Icon getBigIcon() { - return PythonIcons.Python.Python_24; - } - public Icon getNodeIcon(final boolean isOpened) { return PythonIcons.Python.PythonClosed; }