MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

plugin advertiser: do not suggest to update from ultimate to ultimate when 'bundled' plugin is not yet available for current version

Browse Source
This commit is contained in:
Anna Kozlova
2013-12-23 17:12:24 +04:00
parent 6eaeefa2aa
commit 461cd32ee4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginAdvertiserEditorNotificationProvider.java
+1 -1
View File
@@ -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;
}
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java
+4 -2
View File
@@ -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<Plugin> plugins) {
static boolean hasBundledPluginToInstall(Collection<Plugin> 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();