From 7e5c716642796afaba9f2197fa3e8d74da4cad60 Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 21 Mar 2012 17:45:18 +0100 Subject: [PATCH] install plugins from disk: do not warn about optional dependencies (cherry picked from commit b772662) --- .../com/intellij/ide/plugins/InstalledPluginsManagerMain.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsManagerMain.java b/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsManagerMain.java index 501075d8bf51..446cecb77a0c 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsManagerMain.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsManagerMain.java @@ -116,7 +116,9 @@ public class InstalledPluginsManagerMain extends PluginManagerMain { final Set notInstalled = new HashSet(); final Set disabledIds = new HashSet(); final PluginId[] dependentPluginIds = pluginDescriptor.getDependentPluginIds(); + final PluginId[] optionalDependentPluginIds = pluginDescriptor.getOptionalDependentPluginIds(); for (PluginId id : dependentPluginIds) { + if (Arrays.binarySearch(optionalDependentPluginIds, id) > -1) continue; final boolean disabled = ((InstalledPluginsTableModel)pluginsModel).isDisabled(id); final boolean enabled = ((InstalledPluginsTableModel)pluginsModel).isEnabled(id); if (!enabled && !disabled && !PluginManager.isModuleDependency(id)) {