From 0d69d8d54defdd2f547fc7da911f994b75b542b3 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 2 Sep 2009 22:13:19 +0400 Subject: [PATCH] welcome screen sorts a copy of the plugins list, not the list itself --- .../wm/impl/welcomeScreen/WelcomeScreen.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreen.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreen.java index a42dc88a5b30..88020aba8830 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreen.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreen.java @@ -32,8 +32,8 @@ import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.awt.image.PixelGrabber; -import java.util.Arrays; -import java.util.Comparator; +import java.util.*; +import java.util.List; /** * Created by IntelliJ IDEA. @@ -414,9 +414,9 @@ public class WelcomeScreen { private void createListOfPlugins(final JPanel installedPluginsPanel, final JPanel bundledPluginsPanel) { //Create the list of installed plugins - IdeaPluginDescriptor[] myInstalledPlugins = ApplicationManager.getApplication().getPlugins(); + List installedPlugins = new ArrayList(Arrays.asList(ApplicationManager.getApplication().getPlugins())); - if (myInstalledPlugins == null || myInstalledPlugins.length == 0) { + if (installedPlugins.size() == 0) { addListItemToPlugins(installedPluginsPanel, makeItalic(UIBundle .message("welcome.screen.plugins.panel.no.plugins.currently.installed.message.text"))); addListItemToPlugins(bundledPluginsPanel, makeItalic(UIBundle @@ -432,12 +432,12 @@ public class WelcomeScreen { return o1.getName().compareTo(o2.getName()); } }; - Arrays.sort(myInstalledPlugins, pluginsComparator); + Collections.sort(installedPlugins, pluginsComparator); int embeddedPlugins = 0; - int installedPlugins = 0; + int installedPluginsCount = 0; - for (IdeaPluginDescriptor plugin : myInstalledPlugins) { + for (IdeaPluginDescriptor plugin : installedPlugins) { if (plugin.getName().equals("IDEA CORE") || ((IdeaPluginDescriptorImpl) plugin).isUseCoreClassLoader()) { // this is not really a plugin, so it shouldn't be displayed continue; @@ -447,7 +447,7 @@ public class WelcomeScreen { addListItemToPlugins(bundledPluginsPanel, (IdeaPluginDescriptorImpl)plugin); } else { - installedPlugins++; + installedPluginsCount++; addListItemToPlugins(installedPluginsPanel, (IdeaPluginDescriptorImpl)plugin); } } @@ -455,7 +455,7 @@ public class WelcomeScreen { addListItemToPlugins(bundledPluginsPanel, makeItalic(UIBundle .message("welcome.screen.plugins.panel.all.bundled.plugins.were.uninstalled.message.text"))); } - if (installedPlugins == 0) { + if (installedPluginsCount == 0) { addListItemToPlugins(installedPluginsPanel, makeItalic(UIBundle .message("welcome.screen.plugins.panel.no.plugins.currently.installed.message.text"))); }