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

correctly pass optional dependencies when installing plugin (IDEA-65502)

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-02-17 15:05:24 +01:00
parent a68e914e0a
commit 3e7cf29951
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/ide/plugins/ActionInstallPlugin.java
+1 -1
View File
@@ -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");
}
platform/platform-impl/src/com/intellij/ide/plugins/PluginNode.java
+4 -2
View File
@@ -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