From 6385e3e227ddac948b22f6baa243dc2197bd388f Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Thu, 29 Mar 2012 21:21:04 +0200
Subject: [PATCH] do not store installed plugin status in order to avoid
 download problems when plugin is no more acceptable by IDEA

---
 .../src/com/intellij/ide/plugins/ActionInstallPlugin.java  | 4 ++--
 .../com/intellij/ide/plugins/ActionUninstallPlugin.java    | 2 +-
 .../intellij/ide/plugins/InstalledPluginsTableModel.java   | 4 ++--
 .../com/intellij/ide/plugins/PluginManagerColumnInfo.java  | 2 +-
 .../com/intellij/ide/plugins/PluginManagerUISettings.java  | 7 ++++++-
 5 files changed, 12 insertions(+), 7 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 7f92920f3b53..4969f9275175 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/ActionInstallPlugin.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/ActionInstallPlugin.java
@@ -245,8 +245,8 @@ public class ActionInstallPlugin extends AnAction implements DumbAware {
     for (PluginNode pluginNode : list) {
       final String idString = pluginNode.getPluginId().getIdString();
       final PluginManagerUISettings pluginManagerUISettings = PluginManagerUISettings.getInstance();
-      if (!pluginManagerUISettings.myInstalledPlugins.contains(idString)) {
-        pluginManagerUISettings.myInstalledPlugins.add(idString);
+      if (!pluginManagerUISettings.getInstalledPlugins().contains(idString)) {
+        pluginManagerUISettings.getInstalledPlugins().add(idString);
       }
       pluginManagerUISettings.myOutdatedPlugins.remove(idString);
     }
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/ActionUninstallPlugin.java b/platform/platform-impl/src/com/intellij/ide/plugins/ActionUninstallPlugin.java
index 233013813712..2b9ad0cad3df 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/ActionUninstallPlugin.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/ActionUninstallPlugin.java
@@ -106,7 +106,7 @@ public class ActionUninstallPlugin extends AnAction implements DumbAware {
 
     try {
       PluginInstaller.prepareToUninstall(pluginId);
-      final JDOMExternalizableStringList installedPlugins = PluginManagerUISettings.getInstance().myInstalledPlugins;
+      final JDOMExternalizableStringList installedPlugins = PluginManagerUISettings.getInstance().getInstalledPlugins();
       final String pluginIdString = pluginId.getIdString();
       while (installedPlugins.contains(pluginIdString)) {
         installedPlugins.remove(pluginIdString);
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java b/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java
index 3a9a4121ea82..eb7988bdee4d 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java
@@ -255,7 +255,7 @@ public class InstalledPluginsTableModel extends PluginTableModel {
     int state = StringUtil.compareVersionNumbers(descr.getVersion(), existing.getVersion());
     final PluginId pluginId = existing.getPluginId();
     final String idString = pluginId.getIdString();
-    final JDOMExternalizableStringList installedPlugins = PluginManagerUISettings.getInstance().myInstalledPlugins;
+    final JDOMExternalizableStringList installedPlugins = PluginManagerUISettings.getInstance().getInstalledPlugins();
     if (!installedPlugins.contains(idString) && !((IdeaPluginDescriptorImpl)existing).isDeleted()){
       installedPlugins.add(idString);
     }
@@ -537,7 +537,7 @@ public class InstalledPluginsTableModel extends PluginTableModel {
             }
             myBundledLabel.setText("From " + presentableUrl);
           } else {
-            if (PluginManagerUISettings.getInstance().myInstalledPlugins.contains(idString)) {
+            if (PluginManagerUISettings.getInstance().getInstalledPlugins().contains(idString)) {
               myBundledLabel.setText("From repository");
             } else {
               myBundledLabel.setText("Custom");
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerColumnInfo.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerColumnInfo.java
index a8e930bfadcf..1f22aeb65f66 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerColumnInfo.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerColumnInfo.java
@@ -120,7 +120,7 @@ class PluginManagerColumnInfo extends ColumnInfo<IdeaPluginDescriptor, String> {
     if (PluginManager.isPluginInstalled(pluginId)) {
       return false;
     }
-    return PluginManagerUISettings.getInstance().myInstalledPlugins.contains(pluginId.getIdString());
+    return PluginManagerUISettings.getInstance().getInstalledPlugins().contains(pluginId.getIdString());
   }
 
   public Comparator<IdeaPluginDescriptor> getComparator() {
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerUISettings.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerUISettings.java
index d2cdf88c8c57..2ea0726cf743 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerUISettings.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerUISettings.java
@@ -50,13 +50,18 @@ public class PluginManagerUISettings implements PersistentStateComponent<Element
   public boolean AVAILABLE_SORT_BY_STATUS = false;
   public boolean INSTALLED_SORT_BY_STATUS = false;
   public JDOMExternalizableStringList myOutdatedPlugins = new JDOMExternalizableStringList();
-  public JDOMExternalizableStringList myInstalledPlugins = new JDOMExternalizableStringList();
+
+  private JDOMExternalizableStringList myInstalledPlugins = new JDOMExternalizableStringList();
 
   @NonNls private static final String AVAILABLE_PROPORTIONS = "available-proportions";
 
   private final SplitterProportionsData mySplitterProportionsData = new SplitterProportionsDataImpl();
   private final SplitterProportionsData myAvailableSplitterProportionsData = new SplitterProportionsDataImpl();
 
+  public JDOMExternalizableStringList getInstalledPlugins() {
+    return myInstalledPlugins;
+  }
+
   public static PluginManagerUISettings getInstance() {
     return ServiceManager.getService(PluginManagerUISettings.class);
   }