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: ensure that older plugins won't be ever suggested

Browse Source 
(cherry picked from commit 3bd2a55d4272f3154be73a93155cc6c512a7dcaa)
This commit is contained in:
anna
2013-11-28 12:21:41 +01:00
parent b9ee30c79b
commit 41f4842a50
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java
+9 -5
View File
@@ -105,9 +105,9 @@ public class PluginsAdvertiser implements StartupActivity {
}
private static Map<String, Set<Plugin>> loadSupportedExtensions(@NotNull List<IdeaPluginDescriptor> allPlugins) {
final Set<String> availableIds = new HashSet<String>();
final Map<String, IdeaPluginDescriptor> availableIds = new HashMap<String, IdeaPluginDescriptor>();
for (IdeaPluginDescriptor plugin : allPlugins) {
availableIds.add(plugin.getPluginId().getIdString());
availableIds.put(plugin.getPluginId().getIdString(), plugin);
}
final String pluginRepositoryUrl = FEATURE_IMPLEMENTATIONS_URL + "featureType=" + FileTypeFactory.FILE_TYPE_FACTORY_EP.getName();
try {
@@ -125,10 +125,14 @@ public class PluginsAdvertiser implements StartupActivity {
final String pluginId = StringUtil.unquoteString(jsonObject.get("pluginId").toString());
final JsonElement bundledExt = jsonObject.get("bundled");
boolean isBundled = Boolean.parseBoolean(bundledExt.toString());
if (!availableIds.contains(pluginId) && !isBundled) continue;
final IdeaPluginDescriptor fromServerPluginDescription = availableIds.get(pluginId);
if (fromServerPluginDescription == null && !isBundled) continue;
final IdeaPluginDescriptor plugin = PluginManager.getPlugin(PluginId.getId(pluginId));
if (plugin != null && plugin.isEnabled()) continue;
final IdeaPluginDescriptor loadedPlugin = PluginManager.getPlugin(PluginId.getId(pluginId));
if (loadedPlugin != null && loadedPlugin.isEnabled()) continue;
if (loadedPlugin != null && fromServerPluginDescription != null &&
StringUtil.compareVersionNumbers(loadedPlugin.getVersion(), fromServerPluginDescription.getVersion()) >= 0) continue;
final JsonElement ext = jsonObject.get("implementationName");
final String extension = StringUtil.unquoteString(ext.toString());