diff --git a/community-resources/src/plugins/OtherTools.png b/community-resources/src/plugins/OtherTools.png deleted file mode 100644 index 5fb7ae56774c..000000000000 Binary files a/community-resources/src/plugins/OtherTools.png and /dev/null differ diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizePluginsStepPanel.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizePluginsStepPanel.java index 31cd5f4df35f..8924c09780dd 100644 --- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizePluginsStepPanel.java +++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizePluginsStepPanel.java @@ -19,7 +19,6 @@ import com.intellij.ide.plugins.PluginManager; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.VerticalFlowLayout; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import com.intellij.ui.ColorUtil; import com.intellij.ui.JBCardLayout; @@ -68,8 +67,8 @@ public class CustomizePluginsStepPanel extends AbstractCustomizeWizardStep imple add(scrollPane, MAIN); add(myCustomizePanel, CUSTOMIZE); - Map>> groups = pluginGroups.getTree(); - for (final Map.Entry>> entry : groups.entrySet()) { + Map>> groups = pluginGroups.getTree(); + for (final Map.Entry>> entry : groups.entrySet()) { final String group = entry.getKey(); if (PluginGroups.CORE.equals(group)) continue; @@ -91,7 +90,7 @@ public class CustomizePluginsStepPanel extends AbstractCustomizeWizardStep imple return isGroupEnabled(group); } }; - groupPanel.add(new JLabel(IconLoader.getIcon(entry.getValue().getFirst())), gbc); + groupPanel.add(new JLabel(entry.getValue().getFirst()), gbc); //gbc.insets.bottom = 5; groupPanel.add(titleLabel, gbc); JLabel descriptionLabel = new JLabel(pluginGroups.getDescription(group), SwingConstants.CENTER) { diff --git a/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java b/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java index 22fb4a3405ea..5b934935af6b 100644 --- a/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java +++ b/platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java @@ -26,8 +26,10 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; +import icons.PlatformImplIcons; import org.jetbrains.annotations.Nullable; +import javax.swing.*; import java.io.File; import java.util.*; @@ -35,7 +37,7 @@ public class PluginGroups { static final String CORE = "Core"; private static final int MAX_DESCR_LENGTH = 55; - final Map>> myTree = new LinkedHashMap>>(); + final Map>> myTree = new LinkedHashMap>>(); final Map myFeaturedPlugins = new LinkedHashMap(); private final Map> myGroups = new LinkedHashMap>(); @@ -60,8 +62,8 @@ public class PluginGroups { } protected void - initGroups(Map>> tree, Map featuredPlugins) { - tree.put(CORE, Pair.create((String)null, Arrays.asList( + initGroups(Map>> tree, Map featuredPlugins) { + tree.put(CORE, Pair.create((Icon)null, Arrays.asList( "com.intellij.copyright", "com.intellij.java-i18n", "org.intellij.intelliLang", @@ -70,7 +72,7 @@ public class PluginGroups { "Type Migration", "ZKM" ))); - tree.put("Java Frameworks", Pair.create("/plugins/JavaFrameworks.png", Arrays.asList( + tree.put("Java Frameworks", Pair.create(PlatformImplIcons.JavaFrameworks, Arrays.asList( "com.intellij.appengine", "org.intellij.grails", "com.intellij.gwt", @@ -105,12 +107,12 @@ public class PluginGroups { "com.intellij.aspectj", "Osmorc" ))); - tree.put("Build Tools", Pair.create("/plugins/BuildTools.png", Arrays.asList( + tree.put("Build Tools", Pair.create(PlatformImplIcons.BuildTools, Arrays.asList( "AntSupport", "Maven:org.jetbrains.idea.maven,org.jetbrains.idea.maven.ext", "org.jetbrains.plugins.gradle" ))); - tree.put("Web Development", Pair.create("/plugins/WebDevelopment.png", Arrays.asList( + tree.put("Web Development", Pair.create(PlatformImplIcons.WebDevelopment, Arrays.asList( "HTML:HtmlTools,QuirksMode,W3Validators", "org.jetbrains.plugins.haml", "com.jetbrains.plugins.jade", @@ -127,14 +129,14 @@ public class PluginGroups { addVcsGroup(tree); - tree.put("Test Tools", Pair.create("/plugins/TestTools.png", Arrays.asList( + tree.put("Test Tools", Pair.create(PlatformImplIcons.TestTools, Arrays.asList( "JUnit", "TestNG-J", "cucumber-java", "cucumber", "Coverage:Coverage,Emma" ))); - tree.put("Application Servers", Pair.create("/plugins/ApplicationServers.png", Arrays.asList( + tree.put("Application Servers", Pair.create(PlatformImplIcons.ApplicationServers, Arrays.asList( "com.intellij.javaee.view", "Geronimo", "GlassFish", @@ -147,7 +149,7 @@ public class PluginGroups { "com.intellij.dmserver", "JSR45Plugin" ))); - tree.put("Clouds", Pair.create("/plugins/Clouds.png", Arrays.asList( + tree.put("Clouds", Pair.create(PlatformImplIcons.Clouds, Arrays.asList( "CloudFoundry", "CloudBees", "Heroku", @@ -155,16 +157,16 @@ public class PluginGroups { ))); //myTree.put("Groovy", Arrays.asList("org.intellij.grails")); //TODO Scala -> Play 2.x (Play 2.0 Support) - tree.put("Swing", Pair.create("/plugins/Swing.png", Arrays.asList( + tree.put("Swing", Pair.create(PlatformImplIcons.Swing, Arrays.asList( "com.intellij.uiDesigner"//TODO JavaFX? ))); - tree.put("Android", Pair.create("/plugins/Android.png", Arrays.asList( + tree.put("Android", Pair.create(PlatformImplIcons.Android, Arrays.asList( "org.jetbrains.android", "com.intellij.android-designer"))); - tree.put("Database Tools", Pair.create("/plugins/DatabaseTools.png", Arrays.asList( + tree.put("Database Tools", Pair.create(PlatformImplIcons.DatabaseTools, Arrays.asList( "com.intellij.database" ))); - tree.put("Other Tools", Pair.create("/plugins/OtherTools.png", Arrays.asList( + tree.put("Other Tools", Pair.create(PlatformImplIcons.OtherTools, Arrays.asList( "ByteCodeViewer", "com.intellij.dsm", "org.jetbrains.idea.eclipse", @@ -175,7 +177,7 @@ public class PluginGroups { "org.jetbrains.plugins.yaml", "XSLT and XPath:XPathView,XSLT-Debugger" ))); - tree.put("Plugin Development", Pair.create("/plugins/PluginDevelopment.png", Arrays.asList("DevKit"))); + tree.put("Plugin Development", Pair.create(PlatformImplIcons.PluginDevelopment, Arrays.asList("DevKit"))); featuredPlugins.put("Scala", "Custom Languages:Plugin for Scala language support:org.intellij.scala"); featuredPlugins.put("Live Edit Tool", @@ -186,8 +188,8 @@ public class PluginGroups { "Tools Integration:Integration for Atlassian JIRA, Bamboo, Cricible, FishEye:atlassian-idea-plugin"); } - protected static void addVcsGroup(Map>> tree) { - tree.put("Version Controls", Pair.create("/plugins/VersionControls.png", Arrays.asList( + protected static void addVcsGroup(Map>> tree) { + tree.put("Version Controls", Pair.create(PlatformImplIcons.VersionControls, Arrays.asList( "ClearcasePlugin", "CVS", "Git4Idea", @@ -206,7 +208,7 @@ public class PluginGroups { private void initIfNeed() { if (myInitialized) return; myInitialized = true; - for (Map.Entry>> entry : myTree.entrySet()) { + for (Map.Entry>> entry : myTree.entrySet()) { final String group = entry.getKey(); if (CORE.equals(group)) continue; @@ -233,7 +235,7 @@ public class PluginGroups { } } - Map>> getTree() { + Map>> getTree() { initIfNeed(); return myTree; } diff --git a/platform/platform-impl/src/icons/PlatformImplIcons.java b/platform/platform-impl/src/icons/PlatformImplIcons.java new file mode 100644 index 000000000000..87dd75428d01 --- /dev/null +++ b/platform/platform-impl/src/icons/PlatformImplIcons.java @@ -0,0 +1,28 @@ +package icons; + +import com.intellij.openapi.util.IconLoader; + +import javax.swing.*; + +/** + * NOTE THIS FILE IS AUTO-GENERATED + * DO NOT EDIT IT BY HAND, run build/scripts/icons.gant instead + */ +public class PlatformImplIcons { + private static Icon load(String path) { + return IconLoader.getIcon(path, PlatformImplIcons.class); + } + + public static final Icon Android = load("/icons/plugins/Android.png"); // 48x48 + public static final Icon ApplicationServers = load("/icons/plugins/ApplicationServers.png"); // 48x48 + public static final Icon BuildTools = load("/icons/plugins/BuildTools.png"); // 48x48 + public static final Icon Clouds = load("/icons/plugins/Clouds.png"); // 48x48 + public static final Icon DatabaseTools = load("/icons/plugins/DatabaseTools.png"); // 48x48 + public static final Icon JavaFrameworks = load("/icons/plugins/JavaFrameworks.png"); // 48x48 + public static final Icon OtherTools = load("/icons/plugins/OtherTools.png"); // 48x48 + public static final Icon PluginDevelopment = load("/icons/plugins/PluginDevelopment.png"); // 48x48 + public static final Icon Swing = load("/icons/plugins/Swing.png"); // 48x48 + public static final Icon TestTools = load("/icons/plugins/TestTools.png"); // 48x48 + public static final Icon VersionControls = load("/icons/plugins/VersionControls.png"); // 48x48 + public static final Icon WebDevelopment = load("/icons/plugins/WebDevelopment.png"); // 48x48 +} diff --git a/community-resources/src/plugins/Android.png b/platform/platform-impl/src/icons/plugins/Android.png similarity index 100% rename from community-resources/src/plugins/Android.png rename to platform/platform-impl/src/icons/plugins/Android.png diff --git a/community-resources/src/plugins/Android@2x.png b/platform/platform-impl/src/icons/plugins/Android@2x.png similarity index 100% rename from community-resources/src/plugins/Android@2x.png rename to platform/platform-impl/src/icons/plugins/Android@2x.png diff --git a/community-resources/src/plugins/ApplicationServers.png b/platform/platform-impl/src/icons/plugins/ApplicationServers.png similarity index 100% rename from community-resources/src/plugins/ApplicationServers.png rename to platform/platform-impl/src/icons/plugins/ApplicationServers.png diff --git a/community-resources/src/plugins/ApplicationServers@2x.png b/platform/platform-impl/src/icons/plugins/ApplicationServers@2x.png similarity index 100% rename from community-resources/src/plugins/ApplicationServers@2x.png rename to platform/platform-impl/src/icons/plugins/ApplicationServers@2x.png diff --git a/community-resources/src/plugins/BuildTools.png b/platform/platform-impl/src/icons/plugins/BuildTools.png similarity index 100% rename from community-resources/src/plugins/BuildTools.png rename to platform/platform-impl/src/icons/plugins/BuildTools.png diff --git a/community-resources/src/plugins/BuildTools@2x.png b/platform/platform-impl/src/icons/plugins/BuildTools@2x.png similarity index 100% rename from community-resources/src/plugins/BuildTools@2x.png rename to platform/platform-impl/src/icons/plugins/BuildTools@2x.png diff --git a/community-resources/src/plugins/Clouds.png b/platform/platform-impl/src/icons/plugins/Clouds.png similarity index 100% rename from community-resources/src/plugins/Clouds.png rename to platform/platform-impl/src/icons/plugins/Clouds.png diff --git a/community-resources/src/plugins/Clouds@2x.png b/platform/platform-impl/src/icons/plugins/Clouds@2x.png similarity index 100% rename from community-resources/src/plugins/Clouds@2x.png rename to platform/platform-impl/src/icons/plugins/Clouds@2x.png diff --git a/community-resources/src/plugins/DatabaseTools.png b/platform/platform-impl/src/icons/plugins/DatabaseTools.png similarity index 100% rename from community-resources/src/plugins/DatabaseTools.png rename to platform/platform-impl/src/icons/plugins/DatabaseTools.png diff --git a/community-resources/src/plugins/DatabaseTools@2x.png b/platform/platform-impl/src/icons/plugins/DatabaseTools@2x.png similarity index 100% rename from community-resources/src/plugins/DatabaseTools@2x.png rename to platform/platform-impl/src/icons/plugins/DatabaseTools@2x.png diff --git a/community-resources/src/plugins/JavaFrameworks.png b/platform/platform-impl/src/icons/plugins/JavaFrameworks.png similarity index 100% rename from community-resources/src/plugins/JavaFrameworks.png rename to platform/platform-impl/src/icons/plugins/JavaFrameworks.png diff --git a/community-resources/src/plugins/JavaFrameworks@2x.png b/platform/platform-impl/src/icons/plugins/JavaFrameworks@2x.png similarity index 100% rename from community-resources/src/plugins/JavaFrameworks@2x.png rename to platform/platform-impl/src/icons/plugins/JavaFrameworks@2x.png diff --git a/platform/platform-impl/src/icons/plugins/OtherTools.png b/platform/platform-impl/src/icons/plugins/OtherTools.png new file mode 100644 index 000000000000..eabbc4bc32d5 Binary files /dev/null and b/platform/platform-impl/src/icons/plugins/OtherTools.png differ diff --git a/community-resources/src/plugins/OtherTools@2x.png b/platform/platform-impl/src/icons/plugins/OtherTools@2x.png similarity index 100% rename from community-resources/src/plugins/OtherTools@2x.png rename to platform/platform-impl/src/icons/plugins/OtherTools@2x.png diff --git a/community-resources/src/plugins/PluginDevelopment.png b/platform/platform-impl/src/icons/plugins/PluginDevelopment.png similarity index 100% rename from community-resources/src/plugins/PluginDevelopment.png rename to platform/platform-impl/src/icons/plugins/PluginDevelopment.png diff --git a/community-resources/src/plugins/PluginDevelopment@2x.png b/platform/platform-impl/src/icons/plugins/PluginDevelopment@2x.png similarity index 100% rename from community-resources/src/plugins/PluginDevelopment@2x.png rename to platform/platform-impl/src/icons/plugins/PluginDevelopment@2x.png diff --git a/community-resources/src/plugins/Swing.png b/platform/platform-impl/src/icons/plugins/Swing.png similarity index 100% rename from community-resources/src/plugins/Swing.png rename to platform/platform-impl/src/icons/plugins/Swing.png diff --git a/community-resources/src/plugins/Swing@2x.png b/platform/platform-impl/src/icons/plugins/Swing@2x.png similarity index 100% rename from community-resources/src/plugins/Swing@2x.png rename to platform/platform-impl/src/icons/plugins/Swing@2x.png diff --git a/community-resources/src/plugins/TestTools.png b/platform/platform-impl/src/icons/plugins/TestTools.png similarity index 100% rename from community-resources/src/plugins/TestTools.png rename to platform/platform-impl/src/icons/plugins/TestTools.png diff --git a/community-resources/src/plugins/TestTools@2x.png b/platform/platform-impl/src/icons/plugins/TestTools@2x.png similarity index 100% rename from community-resources/src/plugins/TestTools@2x.png rename to platform/platform-impl/src/icons/plugins/TestTools@2x.png diff --git a/community-resources/src/plugins/VersionControls.png b/platform/platform-impl/src/icons/plugins/VersionControls.png similarity index 100% rename from community-resources/src/plugins/VersionControls.png rename to platform/platform-impl/src/icons/plugins/VersionControls.png diff --git a/community-resources/src/plugins/VersionControls@2x.png b/platform/platform-impl/src/icons/plugins/VersionControls@2x.png similarity index 100% rename from community-resources/src/plugins/VersionControls@2x.png rename to platform/platform-impl/src/icons/plugins/VersionControls@2x.png diff --git a/community-resources/src/plugins/WebDevelopment.png b/platform/platform-impl/src/icons/plugins/WebDevelopment.png similarity index 100% rename from community-resources/src/plugins/WebDevelopment.png rename to platform/platform-impl/src/icons/plugins/WebDevelopment.png diff --git a/community-resources/src/plugins/WebDevelopment@2x.png b/platform/platform-impl/src/icons/plugins/WebDevelopment@2x.png similarity index 100% rename from community-resources/src/plugins/WebDevelopment@2x.png rename to platform/platform-impl/src/icons/plugins/WebDevelopment@2x.png