Changeset 6906 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java

Timestamp:

2014-03-10T02:33:20+01:00 (10 years ago)

Author:

Don-vip

Message:

refactor duplicated code - impacts some plugins (reverter, roadsigns, cmdline)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java

@@ -71 +71 @@
             availablePlugins.addAll(available);
         }
+        availablePluginsModified();
+    }
+
+    protected final void availablePluginsModified() {
         sort();
         filterDisplayedPlugins(filterExpression);
@@ -86 +90 @@
     }
 
-    protected  void updateAvailablePlugin(PluginInformation other) {
+    protected void updateAvailablePlugin(PluginInformation other) {
         if (other == null) return;
         PluginInformation pi = getPluginInformation(other.name);
@@ -106 +110 @@
             updateAvailablePlugin(other);
         }
-        sort();
-        filterDisplayedPlugins(filterExpression);
-        Set<String> activePlugins = new HashSet<String>();
-        activePlugins.addAll(Main.pref.getCollection("plugins", activePlugins));
-        for (PluginInformation pi: availablePlugins) {
-            if (selectedPluginsMap.get(pi) == null) {
-                if (activePlugins.contains(pi.name)) {
-                    selectedPluginsMap.put(pi, true);
-                }
-            }
-        }
-        clearChanged();
-        notifyObservers();
+        availablePluginsModified();
     }