From 461cd32ee4f7e523530fe6e68e5c059e2135a887 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 23 Dec 2013 17:12:24 +0400 Subject: [PATCH] plugin advertiser: do not suggest to update from ultimate to ultimate when 'bundled' plugin is not yet available for current version --- .../PluginAdvertiserEditorNotificationProvider.java | 2 +- .../impl/pluginsAdvertisement/PluginsAdvertiser.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginAdvertiserEditorNotificationProvider.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginAdvertiserEditorNotificationProvider.java index 22cb0e9e93c9..31141fe8a2a4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginAdvertiserEditorNotificationProvider.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginAdvertiserEditorNotificationProvider.java @@ -138,7 +138,7 @@ public class PluginAdvertiserEditorNotificationProvider extends EditorNotificati }); } }); - } else if (PluginsAdvertiser.hasBundledNotInstalledPlugin(plugins)){ + } else if (PluginsAdvertiser.hasBundledPluginToInstall(plugins)){ if (PropertiesComponent.getInstance().isTrueValue(PluginsAdvertiser.IGNORE_ULTIMATE_EDITION)) { return null; } diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java index 13d19e9a9028..f7ca502ed6d1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java @@ -42,6 +42,7 @@ import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.EditorNotifications; +import com.intellij.util.PlatformUtils; import com.intellij.util.net.HttpConfigurable; import com.intellij.util.xmlb.XmlSerializer; import com.intellij.util.xmlb.annotations.MapAnnotation; @@ -214,7 +215,8 @@ public class PluginsAdvertiser implements StartupActivity { return null; } - static boolean hasBundledNotInstalledPlugin(Collection plugins) { + static boolean hasBundledPluginToInstall(Collection plugins) { + if (PlatformUtils.isIdea()) return false; for (Plugin plugin : plugins) { if (plugin.myBundled && PluginManager.getPlugin(PluginId.getId(plugin.myPluginId)) == null) { return true; @@ -276,7 +278,7 @@ public class PluginsAdvertiser implements StartupActivity { } } - myBundledPlugins = hasBundledNotInstalledPlugin(ids.values()); + myBundledPlugins = hasBundledPluginToInstall(ids.values()); for (IdeaPluginDescriptor loadedPlugin : myAllPlugins) { final PluginId pluginId = loadedPlugin.getPluginId();