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

Timestamp:

2016-01-24T15:06:37+01:00 (8 years ago)

Author:

Don-vip

Message:

update unit tests

File:

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

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

@@ -83 +83 @@
         activePlugins.addAll(Main.pref.getCollection("plugins", activePlugins));
         for (PluginInformation pi: availablePlugins) {
-            if (selectedPluginsMap.get(pi) == null) {
-                if (activePlugins.contains(pi.name)) {
-                    selectedPluginsMap.put(pi, Boolean.TRUE);
-                }
+            if (selectedPluginsMap.get(pi) == null && activePlugins.contains(pi.name)) {
+                selectedPluginsMap.put(pi, Boolean.TRUE);
             }
         }
@@ -94 +92 @@
 
     protected void updateAvailablePlugin(PluginInformation other) {
-        if (other == null) return;
-        PluginInformation pi = getPluginInformation(other.name);
-        if (pi == null) {
-            availablePlugins.add(other);
-            return;
-        }
-        pi.updateFromPluginSite(other);
+        if (other != null) {
+            PluginInformation pi = getPluginInformation(other.name);
+            if (pi == null) {
+                availablePlugins.add(other);
+                return;
+            }
+            pi.updateFromPluginSite(other);
+        }
     }
 
@@ -216 +215 @@
      */
     public void clearPendingPlugins(Collection<PluginInformation> plugins) {
-        if (plugins == null || plugins.isEmpty()) return;
-        for (PluginInformation pi: plugins) {
-            pendingDownloads.remove(pi.name);
+        if (plugins != null) {
+            for (PluginInformation pi: plugins) {
+                pendingDownloads.remove(pi.name);
+            }
         }
     }
@@ -264 +264 @@
     public boolean isSelectedPlugin(String name) {
         PluginInformation pi = getPluginInformation(name);
-        if (pi == null) return false;
-        if (selectedPluginsMap.get(pi) == null) return false;
+        if (pi == null || selectedPluginsMap.get(pi) == null)
+            return false;
         return selectedPluginsMap.get(pi);
     }
@@ -273 +273 @@
      * the set of activated plugins.
      *
-     * @return the set of newly deactivated plugins
+     * @return the set of newly activated plugins
      */
     public List<PluginInformation> getNewlyActivatedPlugins() {
@@ -289 +289 @@
     /**
      * Replies the set of plugins which have been removed by the user from
-     * the set of activated plugins.
+     * the set of deactivated plugins.
      *
      * @return the set of newly deactivated plugins
@@ -349 +349 @@
      */
     public void refreshLocalPluginVersion(Collection<PluginInformation> plugins) {
-        if (plugins == null) return;
-        for (PluginInformation pi : plugins) {
-            File downloadedPluginFile = PluginHandler.findUpdatedJar(pi.name);
-            if (downloadedPluginFile == null) {
-                continue;
-            }
-            try {
-                PluginInformation newinfo = new PluginInformation(downloadedPluginFile, pi.name);
-                PluginInformation oldinfo = getPluginInformation(pi.name);
-                if (oldinfo == null) {
-                    // should not happen
+        if (plugins != null) {
+            for (PluginInformation pi : plugins) {
+                File downloadedPluginFile = PluginHandler.findUpdatedJar(pi.name);
+                if (downloadedPluginFile == null) {
                     continue;
                 }
-                oldinfo.updateLocalInfo(newinfo);
-            } catch (PluginException e) {
-                Main.error(e);
+                try {
+                    PluginInformation newinfo = new PluginInformation(downloadedPluginFile, pi.name);
+                    PluginInformation oldinfo = getPluginInformation(pi.name);
+                    if (oldinfo != null) {
+                        oldinfo.updateLocalInfo(newinfo);
+                    }
+                } catch (PluginException e) {
+                    Main.error(e);
+                }
             }
         }