Changeset 9611 in josm for trunk/src/org/openstreetmap

Timestamp:

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

Author:

Don-vip

Message:

update unit tests

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ExpertToggleAction.java (modified) (1 diff)
• gui/preferences/plugin/PluginPreference.java (modified) (9 diffs)
• gui/preferences/plugin/PluginPreferencesModel.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java

@@ -124 +124 @@
         );
         putValue("toolbar", "expertmode");
-        Main.toolbar.register(this);
+        if (Main.toolbar != null) {
+            Main.toolbar.register(this);
+        }
         setSelected(Main.pref.getBoolean("expert", false));
         notifySelectedState();

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

@@ -74 +74 @@
     }
 
+    private JosmTextField tfFilter;
+    private PluginListPanel pnlPluginPreferences;
+    private PluginPreferencesModel model;
+    private JScrollPane spPluginPreferences;
+    private PluginUpdatePolicyPanel pnlPluginUpdatePolicy;
+
+    /**
+     * is set to true if this preference pane has been selected by the user
+     */
+    private boolean pluginPreferencesActivated;
+
     private PluginPreference() {
         super(/* ICON(preferences/) */ "plugin", tr("Plugins"), tr("Configure available plugins."), false, new JTabbedPane());
@@ -146 +157 @@
     }
 
-    private JosmTextField tfFilter;
-    private PluginListPanel pnlPluginPreferences;
-    private PluginPreferencesModel model;
-    private JScrollPane spPluginPreferences;
-    private PluginUpdatePolicyPanel pnlPluginUpdatePolicy;
-
-    /**
-     * is set to true if this preference pane has been selected
-     * by the user
-     */
-    private boolean pluginPreferencesActivated;
-
     protected JPanel buildSearchFieldPanel() {
-        JPanel pnl  = new JPanel(new GridBagLayout());
+        JPanel pnl = new JPanel(new GridBagLayout());
         pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         GridBagConstraints gc = new GridBagConstraints();
@@ -268 +267 @@
 
     /**
-     * Replies the list of plugins waiting for update or download
+     * Replies the set of plugins waiting for update or download
      *
-     * @return the list of plugins waiting for update or download
+     * @return the set of plugins waiting for update or download
      */
     public Set<PluginInformation> getPluginsScheduledForUpdateOrDownload() {
@@ -276 +275 @@
     }
 
+    /**
+     * Replies the list of plugins which have been added by the user to the set of activated plugins
+     *
+     * @return the list of newly activated plugins
+     */
     public List<PluginInformation> getNewlyActivatedPlugins() {
         return model != null ? model.getNewlyActivatedPlugins() : null;
@@ -289 +293 @@
             Collections.sort(l);
             Main.pref.putCollection("plugins", l);
-            if (!model.getNewlyDeactivatedPlugins().isEmpty()) return true;
+            if (!model.getNewlyDeactivatedPlugins().isEmpty())
+                return true;
             for (PluginInformation pi : model.getNewlyActivatedPlugins()) {
-                if (!pi.canloadatruntime) return true;
+                if (!pi.canloadatruntime)
+                    return true;
             }
         }
@@ -308 +314 @@
             @Override
             public void run() {
-                if (task.isCanceled()) return;
-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        model.setAvailablePlugins(task.getAvailablePlugins());
-                        pnlPluginPreferences.refreshView();
-                    }
-                });
+                if (!task.isCanceled()) {
+                    SwingUtilities.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                            model.setAvailablePlugins(task.getAvailablePlugins());
+                            pnlPluginPreferences.refreshView();
+                        }
+                    });
+                }
             }
         };
@@ -346 +353 @@
                 @Override
                 public void run() {
-                    if (task.isCanceled()) return;
-                    SwingUtilities.invokeLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            model.updateAvailablePlugins(task.getAvailablePlugins());
-                            pnlPluginPreferences.refreshView();
-                            Main.pref.putInteger("pluginmanager.version", Version.getInstance().getVersion()); // fix #7030
-                        }
-                    });
+                    if (!task.isCanceled()) {
+                        SwingUtilities.invokeLater(new Runnable() {
+                            @Override
+                            public void run() {
+                                model.updateAvailablePlugins(task.getAvailablePlugins());
+                                pnlPluginPreferences.refreshView();
+                                Main.pref.putInteger("pluginmanager.version", Version.getInstance().getVersion()); // fix #7030
+                            }
+                        });
+                    }
                 }
             };
@@ -512 +520 @@
     private static class PluginConfigurationSitesPanel extends JPanel {
 
-        private DefaultListModel<String> model;
-
-        protected final void build() {
-            setLayout(new GridBagLayout());
+        private final DefaultListModel<String> model = new DefaultListModel<>();
+
+        PluginConfigurationSitesPanel() {
+            super(new GridBagLayout());
             add(new JLabel(tr("Add JOSM Plugin description URL.")), GBC.eol());
-            model = new DefaultListModel<>();
             for (String s : Main.pref.getPluginSites()) {
                 model.addElement(s);
@@ -582 +589 @@
         }
 
-        PluginConfigurationSitesPanel() {
-            build();
-        }
-
         public List<String> getUpdateSites() {
-            if (model.getSize() == 0) return Collections.emptyList();
+            if (model.getSize() == 0)
+                return Collections.emptyList();
             List<String> ret = new ArrayList<>(model.getSize());
             for (int i = 0; i < model.getSize(); i++) {

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);
+                }
             }
         }