From 3e7cf29951387e1360f1dc3dd7c261177f65cd0e Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 17 Feb 2011 15:05:24 +0100
Subject: [PATCH] correctly pass optional dependencies when installing plugin
 (IDEA-65502)

---
 .../src/com/intellij/ide/plugins/ActionInstallPlugin.java   | 2 +-
 .../src/com/intellij/ide/plugins/PluginNode.java            | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/ActionInstallPlugin.java b/platform/platform-impl/src/com/intellij/ide/plugins/ActionInstallPlugin.java
index 1f4967964880..e9f22adf8b75 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/ActionInstallPlugin.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/ActionInstallPlugin.java
@@ -85,7 +85,7 @@ public class ActionInstallPlugin extends AnAction implements DumbAware {
         else if (descr instanceof IdeaPluginDescriptorImpl) {
           pluginNode = new PluginNode(descr.getPluginId());
           pluginNode.setName(descr.getName());
-          pluginNode.setDepends(Arrays.asList(descr.getDependentPluginIds()));
+          pluginNode.setDepends(Arrays.asList(descr.getDependentPluginIds()), descr.getOptionalDependentPluginIds());
           pluginNode.setSize("-1");
         }
 
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginNode.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginNode.java
index c5fcd1d51e6c..3bbc90df1de1 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginNode.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginNode.java
@@ -56,6 +56,7 @@ public class PluginNode implements IdeaPluginDescriptor {
   private String url;
   private long date = Long.MAX_VALUE;
   private List<PluginId> depends;
+  private PluginId[] myOptionalDependencies;
 
   private int status = STATUS_UNKNOWN;
   private boolean loaded = false;
@@ -221,8 +222,9 @@ public class PluginNode implements IdeaPluginDescriptor {
     return depends;
   }
 
-  public void setDepends(List<PluginId> depends) {
+  public void setDepends(List<PluginId> depends, PluginId[] optionalDependencies) {
     this.depends = depends;
+    myOptionalDependencies = optionalDependencies;
   }
 
 
@@ -258,7 +260,7 @@ public class PluginNode implements IdeaPluginDescriptor {
 
   @Nullable
   public PluginId[] getOptionalDependentPluginIds() {
-    return null;
+    return myOptionalDependencies;
   }
 
   @Nullable