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

plugins: update existing descriptor if it exists (IDEA-77448 )

Browse Source
This commit is contained in:
anna
2011-11-23 11:17:08 +01:00
parent f3a2131881
commit ddbcdda159
3 changed files with 13 additions and 7 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
@@ -104,7 +104,7 @@ public class ActionInstallPlugin extends AnAction implements DumbAware {
}
final InstalledPluginsTableModel installedPluginsModel = (InstalledPluginsTableModel)installed.getPluginsModel();
for (PluginNode node : list) {
installedPluginsModel.appendDescriptor(node);
installedPluginsModel.appendOrUpdateDescriptor(node);
}
installed.setRequireShutdown(true);
}
platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsManagerMain.java
+1 -1
View File
@@ -91,7 +91,7 @@ public class InstalledPluginsManagerMain extends PluginManagerMain {
return;
}
PluginDownloader.install(file, file.getName());
((InstalledPluginsTableModel)pluginsModel).appendDescriptor(pluginDescriptor);
((InstalledPluginsTableModel)pluginsModel).appendOrUpdateDescriptor(pluginDescriptor);
select(pluginDescriptor);
setRequireShutdown(true);
}
platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java
+11 -5
View File
@@ -84,11 +84,17 @@ public class InstalledPluginsTableModel extends PluginTableModel {
setSortKey(new RowSorter.SortKey(getNameColumn(), SortOrder.ASCENDING));
}
public void appendDescriptor(IdeaPluginDescriptor descriptor) {
myInstalled.add(descriptor);
view.add(descriptor);
setEnabled(descriptor, true);
fireTableDataChanged();
public void appendOrUpdateDescriptor(IdeaPluginDescriptor descriptor) {
final PluginId descrId = descriptor.getPluginId();
final IdeaPluginDescriptor existing = PluginManager.getPlugin(descrId);
if (existing != null) {
updateExistingPluginInfo(descriptor, existing);
} else {
myInstalled.add(descriptor);
view.add(descriptor);
setEnabled(descriptor, true);
fireTableDataChanged();
}
}
public static int getCheckboxColumn() {