Kill plugin logos

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/DefaultWelcomeScreen.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/DefaultWelcomeScreen.java
index cf3d112a5d3e41d50aeb21a65e8eb7c5056bb800..72c96c284842f9b95efef3d55eec286a61f1f269 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/DefaultWelcomeScreen.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/DefaultWelcomeScreen.java
@@ -464,19 +464,17 @@ public class DefaultWelcomeScreen implements WelcomeScreen {
   }
 
   private void addListItemToPlugins(final JPanel bundledPluginsPanel, final String title) {
-    addListItemToPlugins(bundledPluginsPanel, title, null, null, null, null, true, false);
+    addListItemToPlugins(bundledPluginsPanel, title, null, null, true, false);
   }
 
   private void addListItemToPlugins(final JPanel bundledPluginsPanel, final IdeaPluginDescriptorImpl plugin) {
-    addListItemToPlugins(bundledPluginsPanel, plugin.getName(), plugin.getDescription(), plugin.getVendorLogoPath(),
-                         plugin.getPluginClassLoader(), plugin.getUrl(), plugin.isEnabled(), PluginManager.isIncompatible(plugin));
+    addListItemToPlugins(bundledPluginsPanel, plugin.getName(), plugin.getDescription(),
+                         plugin.getUrl(), plugin.isEnabled(), PluginManager.isIncompatible(plugin));
   }
 
   public void addListItemToPlugins(final JPanel panel,
                                    String name,
                                    @Nullable String description,
-                                   @Nullable final String iconPath,
-                                   @Nullable final ClassLoader pluginClassLoader,
                                    @Nullable final String url,
                                    final boolean enabled,
                                    final boolean incompatible) {
@@ -488,17 +486,8 @@ public class DefaultWelcomeScreen implements WelcomeScreen {
     }
 
     final int y = myPluginsIdx += 2;
-    Icon logoImage;
 
-    // Check the iconPath and insert empty icon in case of empty or invalid value
-    if (StringUtil.isEmptyOrSpaces(iconPath)) {
-      logoImage = new EmptyIcon(PLUGIN_LOGO_SIZE.width, PLUGIN_LOGO_SIZE.height);
-    }
-    else {
-      logoImage = IconLoader.findIcon(iconPath, pluginClassLoader);
-      if (logoImage == null) logoImage = new EmptyIcon(PLUGIN_LOGO_SIZE.width, PLUGIN_LOGO_SIZE.height);
-    }
-    JLabel imageLabel = new JLabel(logoImage);
+    JLabel imageLabel = new JLabel(); // There used to be a logo, which is removed and I'm (max) lazy enough fixing gridbag
     GridBagConstraints gBC = new GridBagConstraints(0, y, 1, 1, 0, 0, NORTHWEST, NONE, new Insets(15, 20, 0, 0), 0, 0);
     panel.add(imageLabel, gBC);
 

diff --git a/plugins/IntelliLang/src/META-INF/plugin.xml b/plugins/IntelliLang/src/META-INF/plugin.xml
index 8682c2d26726fc75cd213793316e6f063f394891..96c446486839c842742f6259fd715fad663a7b27 100644 (file)
--- a/plugins/IntelliLang/src/META-INF/plugin.xml
+++ b/plugins/IntelliLang/src/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin url="http://www.jetbrains.net/confluence/display/CONTEST/IntelliLang" version="2">
   <name>IntelliLang</name>
   <id>org.intellij.intelliLang</id>
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
   <description><![CDATA[User configurable language injection support (originally developed by Sascha Weinreuter sascha.weinreuter@cit.de)]]></description>
   <version>8.0</version>
 

diff --git a/plugins/android-designer/src/META-INF/plugin.xml b/plugins/android-designer/src/META-INF/plugin.xml
index 36fb46e22dca4a10fcf348029a89d81505cbd2cb..a5c6f97edf366d664760bae325a6d3b81374d830 100644 (file)
--- a/plugins/android-designer/src/META-INF/plugin.xml
+++ b/plugins/android-designer/src/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2">\r
   <name>Android Designer</name>\r
   <id>com.intellij.android-designer</id>\r
-  <vendor logo="/icons/android.png">JetBrains</vendor>\r
+  <vendor>JetBrains</vendor>\r
 \r
   <resource-bundle>messages.AndroidDesignerBundle</resource-bundle>\r
 \r

diff --git a/plugins/android/src/META-INF/plugin.xml b/plugins/android/src/META-INF/plugin.xml
index f340493a27e90f636adc68f8d1ef4737cc473c75..c72f0a8f607b20432399606713b8c2e80c429469 100644 (file)
--- a/plugins/android/src/META-INF/plugin.xml
+++ b/plugins/android/src/META-INF/plugin.xml
@@ -5,7 +5,7 @@
     Supports development of Open Handset Alliance Android applications with IntelliJ IDEA.
   </description>
   <version>10.0</version>
-  <vendor logo="/icons/android.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
   <application-components>
     <component>
       <implementation-class>org.jetbrains.android.AndroidPlugin</implementation-class>

diff --git a/plugins/ant/src/META-INF/plugin.xml b/plugins/ant/src/META-INF/plugin.xml
index e2019fee96444605ae4053bf2441a5f9055a3ea0..4f31ac0a25b2652a595b3109ec70ed1c2d4233a9 100644 (file)
--- a/plugins/ant/src/META-INF/plugin.xml
+++ b/plugins/ant/src/META-INF/plugin.xml
@@ -4,7 +4,7 @@
   <version>1.0</version>
   <idea-version min="6.0"/>
   <description>Editing, maintaining and running ANT build scripts inside IntelliJ IDEA.</description>
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
 
   <resource-bundle>com.intellij.lang.ant.resources.AntActionsBundle</resource-bundle>
   <depends>com.intellij.properties</depends>

diff --git a/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml b/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
index 4861b89cee9acc023b339893cec8de165d17f6b1..20f34c5513b0dfd289e592d60350895b6bdde223 100644 (file)
--- a/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
+++ b/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
@@ -2,7 +2,7 @@
   <name>CVS Integration</name>
   <id>CVS</id>
   <version>11</version>
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
   <resource-bundle>com.intellij.cvsSupport2.CvsBundle</resource-bundle>
   <category>VCS Integration</category>
 

diff --git a/plugins/devkit/resources/META-INF/plugin.xml b/plugins/devkit/resources/META-INF/plugin.xml
index 6027935d71c85c6ada2e873bc92b8846ea75862c..182fa6230174d966fd26d665cdee315c59db3137 100644 (file)
--- a/plugins/devkit/resources/META-INF/plugin.xml
+++ b/plugins/devkit/resources/META-INF/plugin.xml
@@ -4,7 +4,7 @@
   <version>1.0</version>
 
   <category>inspection</category>
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
 
   <depends>com.intellij.properties</depends>
 

diff --git a/plugins/gettext/src/META-INF/plugin.xml b/plugins/gettext/src/META-INF/plugin.xml
index 79d3d137d04f1e97fa21da078da548da7c8cabb1..95f0a5db6262394b353505eec18f30b5f2268c4f 100644 (file)
--- a/plugins/gettext/src/META-INF/plugin.xml
+++ b/plugins/gettext/src/META-INF/plugin.xml
@@ -7,7 +7,7 @@
   <version>1.0</version>
   <idea-version since-build="107.105"/>
 
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
   <depends>com.intellij.modules.lang</depends>
 
   <extensions defaultExtensionNs="com.intellij">
@@ -20,4 +20,4 @@
     <completion.contributor language="GetText" implementationClass="com.jetbrains.gettext.completion.GetTextCompletionContributor"/>
 
   </extensions>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>

diff --git a/plugins/github/src/META-INF/plugin.xml b/plugins/github/src/META-INF/plugin.xml
index e6fa00a6b744c434817e7135f0c9cb2f24a106c6..10745c9f29fcf6d0db2df50f3a61d4ac6486c4c5 100644 (file)
--- a/plugins/github/src/META-INF/plugin.xml
+++ b/plugins/github/src/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>GitHub</name>
   <id>org.jetbrains.plugins.github</id>
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
   <description>GitHub integration</description>
 
   <depends>com.intellij.modules.lang</depends>

diff --git a/plugins/gradle/src/META-INF/plugin.xml b/plugins/gradle/src/META-INF/plugin.xml
index 5b5bd702432ed4c4483ea044a196e30cdd09fc48..1b092d828be24963350f440c8ecce053562fc432 100644 (file)
--- a/plugins/gradle/src/META-INF/plugin.xml
+++ b/plugins/gradle/src/META-INF/plugin.xml
@@ -17,7 +17,7 @@
 <idea-plugin url="http://confluence.jetbrains.net/display/IDEADEV/Gradle+integration">
   <name>Gradle</name>
   <id>org.jetbrains.plugins.gradle</id>
-  <vendor logo="/icons/gradle.png" url="http://www.jetbrains.com">JetBrains Inc.</vendor>
+  <vendor>JetBrains</vendor>
   <description>Gradle integration</description>
 
   <depends>com.intellij.modules.lang</depends>

diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index e183e3a28f07544a2b26ebaac785775df0322705..b4c7e60866f20ae8783dd637d8390418f2c90f0b 100644 (file)
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -19,8 +19,7 @@
   <name>Groovy</name>
   <description>Plugin for Groovy language support, including Groovy++, Grape, Gant and Griffon</description>
   <version>9.0</version>
-  <vendor logo="/icons/groovy/groovy_16x16.png" url="http://www.jetbrains.com">JetBrains Inc.
-  </vendor>
+  <vendor>JetBrains</vendor>
   <depends>com.intellij.properties</depends>
 
   <depends optional="true" config-file="groovy-copyright.xml">com.intellij.copyright</depends>

diff --git a/plugins/java-i18n/src/META-INF/plugin.xml b/plugins/java-i18n/src/META-INF/plugin.xml
index 69e43cf6d080aff757e5615a8e2eb6a566dfcc29..ee4e95c9dddb954499054caa91ba125dc39237dd 100644 (file)
--- a/plugins/java-i18n/src/META-INF/plugin.xml
+++ b/plugins/java-i18n/src/META-INF/plugin.xml
@@ -5,7 +5,7 @@
   <description>
     This plugin provides code inspections and corresponding quick fixes for code internationalization.
   </description>
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
   <resource-bundle>messages.PropertiesBundle</resource-bundle>
   <extensionPoints>
     <extensionPoint name="resourceBundleManager"

diff --git a/plugins/junit/src/META-INF/plugin.xml b/plugins/junit/src/META-INF/plugin.xml
index 03df6e10592381717fad0948748f4beadb449f53..2744ab535c214f4980d5c762d8b84e199b77af32 100644 (file)
--- a/plugins/junit/src/META-INF/plugin.xml
+++ b/plugins/junit/src/META-INF/plugin.xml
@@ -18,7 +18,7 @@
   <name>JUnit</name>
   <description>Provides possibility to run JUnit 3.x and 4.x tests and view their results</description>
   <version>1.0</version>
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
   <extensions defaultExtensionNs="com.intellij">
     <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <configurationProducer implementation="com.intellij.execution.junit.AllInPackageConfigurationProducer"/>
@@ -65,4 +65,4 @@
       <add-to-group anchor="first" group-id="RunContextGroup"/>
     </group>
   </actions>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>

diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml
index eaad3090e89690ab315d7f3b4b857e178bd59d5c..986532f60a80e98b766c141274e131a975fe91af 100644 (file)
--- a/plugins/maven/src/main/resources/META-INF/plugin.xml
+++ b/plugins/maven/src/main/resources/META-INF/plugin.xml
@@ -3,7 +3,7 @@
 
   <name>Maven Integration</name>
   <description>Import Maven projects and execute Maven goals</description>
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
 
   <extensionPoints>
     <extensionPoint name="importer" interface="org.jetbrains.idea.maven.importing.MavenImporter"/>

diff --git a/plugins/properties/src/META-INF/plugin.xml b/plugins/properties/src/META-INF/plugin.xml
index f0fbb3d798f8922ff6f6b1b0110529397ae51a61..1a94d552905738ed461d434bef11e811cc6c31ab 100644 (file)
--- a/plugins/properties/src/META-INF/plugin.xml
+++ b/plugins/properties/src/META-INF/plugin.xml
@@ -5,7 +5,7 @@
   <description>
     This plugin enables smart editing of properties files.
   </description>
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
 
   <extensionPoints>
     <extensionPoint name="implicitPropertyUsageProvider" interface="com.intellij.codeInspection.unused.ImplicitPropertyUsageProvider"/>

diff --git a/plugins/svn4idea/src/META-INF/plugin.xml b/plugins/svn4idea/src/META-INF/plugin.xml
index d71b37aa2283e174c1808ff2a172f4bc861c2448..83b79bf0caf5089cd9dbf37dd45b1b4b68741065 100644 (file)
--- a/plugins/svn4idea/src/META-INF/plugin.xml
+++ b/plugins/svn4idea/src/META-INF/plugin.xml
@@ -5,7 +5,7 @@
   <category>VCS Integration</category>
   <description>For Subversion 1.7 and older versions</description>
   <depends>com.intellij.modules.vcs</depends>
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
   <resource-bundle>org.jetbrains.idea.svn.SvnBundle</resource-bundle>
   <project-components>
     <component>

diff --git a/plugins/swing-designer/src/META-INF/plugin.xml b/plugins/swing-designer/src/META-INF/plugin.xml
index 48e8a04476fe14c16d032170421d6a4bea370148..b949060d78d1110bea1d3acf9396d08be931d86c 100644 (file)
--- a/plugins/swing-designer/src/META-INF/plugin.xml
+++ b/plugins/swing-designer/src/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2">
   <name>Swing Designer</name>
   <id>com.intellij.swing-designer</id>
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
   <resource-bundle>messages.SwingDesignerBundle</resource-bundle>
   <depends>com.intellij.java-i18n</depends>
   <depends>com.intellij.properties</depends>

diff --git a/plugins/tasks/tasks-core/src/META-INF/plugin.xml b/plugins/tasks/tasks-core/src/META-INF/plugin.xml
index dd1d123199be9fdaaff9ef5a27a3d7342fab163a..74a020d2ff6f94a6f1f6900dcab00d5ff00abe9d 100644 (file)
--- a/plugins/tasks/tasks-core/src/META-INF/plugin.xml
+++ b/plugins/tasks/tasks-core/src/META-INF/plugin.xml
@@ -5,7 +5,7 @@
   <description>Enables task and context management</description>
 
   <version>1.0</version>
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
 
   <!--fake dependency for Web IDE-->
   <depends>com.intellij.modules.xml</depends>

diff --git a/plugins/testng/src/META-INF/plugin.xml b/plugins/testng/src/META-INF/plugin.xml
index c656cbbc90b106df780004c6eedd2bd78e8c0793..570b84574cf14bd97106fbce7f0f4e128ef582fb 100644 (file)
--- a/plugins/testng/src/META-INF/plugin.xml
+++ b/plugins/testng/src/META-INF/plugin.xml
@@ -2,7 +2,7 @@
     <name>TestNG-J</name>
     <description>TestNG Integration</description>
     <version>8.0</version>
-    <vendor logo="/resources/testNG.png">Theory In Practice</vendor>
+    <vendor>Theory In Practice</vendor>
     <depends>com.intellij.java-i18n</depends>
     <extensions defaultExtensionNs="com.intellij">
         <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>

diff --git a/plugins/ui-designer/src/META-INF/plugin.xml b/plugins/ui-designer/src/META-INF/plugin.xml
index ede8afcb4ad906f8098798a0cd96f23575388218..5360f4f9a2a59f627a170c947027a008187c246f 100644 (file)
--- a/plugins/ui-designer/src/META-INF/plugin.xml
+++ b/plugins/ui-designer/src/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2">
   <name>UI Designer</name>
   <id>com.intellij.uiDesigner</id>
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
   <resource-bundle>messages.UIDesignerBundle</resource-bundle>
   <depends>com.intellij.java-i18n</depends>
   <depends>com.intellij.properties</depends>

diff --git a/plugins/ui-designer/ui-designer-new/src/META-INF/plugin.xml b/plugins/ui-designer/ui-designer-new/src/META-INF/plugin.xml
index 460977b5b2bf31d9fbfa8e4797e4c441a544c11a..ca2b538f5ef2245b91d2283284d675bc3d244ff5 100644 (file)
--- a/plugins/ui-designer/ui-designer-new/src/META-INF/plugin.xml
+++ b/plugins/ui-designer/ui-designer-new/src/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2">\r
   <name>UI Designer (Core)</name>\r
   <id>com.intellij.ui-designer-new</id>\r
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>\r
+  <vendor>JetBrains</vendor>\r
 \r
   <resource-bundle>messages.DesignerBundle</resource-bundle>\r
 \r

diff --git a/samples/actions/src/META-INF/plugin.xml b/samples/actions/src/META-INF/plugin.xml
index 000d97456224b1f777d813ca0ea50049b908d186..003606ef6912ef1fcc868bfd772f9e9f422937c0 100644 (file)
--- a/samples/actions/src/META-INF/plugin.xml
+++ b/samples/actions/src/META-INF/plugin.xml
@@ -9,7 +9,7 @@
   <version>1.0</version>
 
   <!-- Plugin's vendor -->
-  <vendor logo="/general/ijLogo.png">IntelliJ</vendor>
+  <vendor>IntelliJ</vendor>
 
   <!-- the IDEA build number which works with plugin -->
     <!--

diff --git a/samples/comparingReferences/source/META-INF/plugin.xml b/samples/comparingReferences/source/META-INF/plugin.xml
index 40d97b0933a5e9e7ad4ae89d1e1112cabe8d83fd..36bf3d61f8347f154f13cfd7d84a35240a0247b8 100644 (file)
--- a/samples/comparingReferences/source/META-INF/plugin.xml
+++ b/samples/comparingReferences/source/META-INF/plugin.xml
@@ -2,7 +2,7 @@
   <name>Comparing References Inspection</name>
   <description>Inspection for (probably) inappropriate use of equality relation operation.</description>
   <version>1.0</version>
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
     <!--
     <idea-version since-build="3000"/>
     -->

diff --git a/samples/conditionalOperatorConvertor/META-INF/plugin.xml b/samples/conditionalOperatorConvertor/META-INF/plugin.xml
index c259015dd5bdc3cee77b4c9acffea8b30e8d2313..17c55b92a20049f406ad6be33728e92af2624382 100644 (file)
--- a/samples/conditionalOperatorConvertor/META-INF/plugin.xml
+++ b/samples/conditionalOperatorConvertor/META-INF/plugin.xml
@@ -5,7 +5,7 @@
         'if' block.
     </description>
     <version>1.3</version>
-    <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+    <vendor>JetBrains</vendor>
    <!--
     <idea-version since-build="2000"/>
     -->

diff --git a/samples/plugin/src/META-INF/plugin.xml b/samples/plugin/src/META-INF/plugin.xml
index de55aaca27971fe7b47b7ca1334d922480f609ad..e6d2cf0c7146cc925956605ece1f1786ab3bb0b7 100644 (file)
--- a/samples/plugin/src/META-INF/plugin.xml
+++ b/samples/plugin/src/META-INF/plugin.xml
@@ -5,7 +5,7 @@
   <description>A minimalistic sample plugin for IntelliJ IDEA</description>
 <!-- plugin version -->
   <version>1.0</version>
-  <vendor logo="/general/ijLogo.png">IntelliJ</vendor>
+  <vendor>IntelliJ</vendor>
 <!-- minimum IDEA build number with which the plugin is compatible -->
  <!--
   <idea-version since-build="2000"/>

diff --git a/samples/vfs/src/META-INF/plugin.xml b/samples/vfs/src/META-INF/plugin.xml
index 26ade81d01c98bfea5ab561eef4a68bea2e2fe6b..19f425524c5031e1b10b3e0c3c9af396054fc251 100644 (file)
--- a/samples/vfs/src/META-INF/plugin.xml
+++ b/samples/vfs/src/META-INF/plugin.xml
@@ -9,7 +9,7 @@
   <version>1.0</version>
 
   <!-- Plugin's vendor -->
-  <vendor logo="/general/ijLogo.png">IntelliJ</vendor>
+  <vendor>IntelliJ</vendor>
 
   <!-- Minimum IDEA build number with which the plugin is compatible -->
     <!--

diff --git a/xml/tests/testData/xml/CorrectGeneratedDtdUpdate.xml b/xml/tests/testData/xml/CorrectGeneratedDtdUpdate.xml
index f8836e3d620d5034d3d06339a1e79e82b42ee3f4..9bfe1be9df6e4399846366c7fcaea721268f32b7 100644 (file)
--- a/xml/tests/testData/xml/CorrectGeneratedDtdUpdate.xml
+++ b/xml/tests/testData/xml/CorrectGeneratedDtdUpdate.xml
@@ -2,7 +2,7 @@
   <name>HTML Designer</name>
   <id>com.intellij.htmlDesigner</id>
   <version>1.0</version>
-  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
   <idea-version min="5.0" max="5.0"/>
 
   <selection><</selection>extensionPoints>