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

do not mark Plugins modified if plugin was disabled on startup due to incompatibility changes (IDEA-114768)

Browse Source
This commit is contained in:
Anna Kozlova
2014-09-29 16:09:16 +02:00
parent 330314c2e8
commit 2a6eafd217
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsManagerMain.java
+7 -2
View File
@@ -318,9 +318,15 @@ public class InstalledPluginsManagerMain extends PluginManagerMain {
public boolean isModified() {
final boolean modified = super.isModified();
if (modified) return true;
final List<String> disabledPlugins = PluginManagerCore.getDisabledPlugins();
for (int i = 0; i < pluginsModel.getRowCount(); i++) {
final IdeaPluginDescriptor pluginDescriptor = pluginsModel.getObjectAt(i);
if (pluginDescriptor.isEnabled() != ((InstalledPluginsTableModel)pluginsModel).isEnabled(pluginDescriptor.getPluginId())) {
final PluginId pluginId = pluginDescriptor.getPluginId();
final boolean enabledInTable = ((InstalledPluginsTableModel)pluginsModel).isEnabled(pluginId);
if (pluginDescriptor.isEnabled() != enabledInTable) {
if (enabledInTable && !disabledPlugins.contains(pluginId.getIdString())) {
continue; //was disabled automatically on startup
}
return true;
}
}
@@ -330,7 +336,6 @@ public class InstalledPluginsManagerMain extends PluginManagerMain {
return true;
}
}
final List<String> disabledPlugins = PluginManagerCore.getDisabledPlugins();
for (Map.Entry<PluginId, Boolean> entry : ((InstalledPluginsTableModel)pluginsModel).getEnabledMap().entrySet()) {
final Boolean enabled = entry.getValue();
if (enabled != null && !enabled.booleanValue() && !disabledPlugins.contains(entry.getKey().toString())) {