Changeset 3090 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2010-03-06T12:37:34+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #4443: Plugins with known update site: Don't download unless a new version is available
fixed #4565: local version differs from local version of updated plugin (was: local version number lost, after update plugin list.)

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• PluginPreference.java (modified) (7 diffs)
• plugin/PluginPreferencesModel.java (modified) (3 diffs)

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

@@ -17 +17 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -77 +78 @@
             sb.append("<ul>");
             for(PluginInformation pi: downloaded) {
-                sb.append("<li>").append(pi.name).append("</li>");
+                sb.append("<li>").append(pi.name).append(" (").append(pi.version).append(")").append("</li>");
             }
             sb.append("</ul>");
@@ -283 +284 @@
                     SwingUtilities.invokeLater(new Runnable() {
                         public void run() {
-                            model.setAvailablePlugins(task.getAvailabePlugins());
+                            model.updateAvailablePlugins(task.getAvailabePlugins());
                             pnlPluginPreferences.refreshView();
-
                         }
                     });
@@ -320 +320 @@
                     sb.toString(),
                     tr("Update plugins"),
-                    failed.isEmpty() ? JOptionPane.WARNING_MESSAGE : JOptionPane.INFORMATION_MESSAGE,
+                    !failed.isEmpty() ? JOptionPane.WARNING_MESSAGE : JOptionPane.INFORMATION_MESSAGE,
                             // FIXME: check help topic
                             HelpUtil.ht("/Preferences/Plugin")
@@ -326 +326 @@
         }
 
+        protected void alertNothingToUpdate() {
+            HelpAwareOptionPane.showOptionDialog(
+                    pnlPluginPreferences,
+                    tr("All installed plugins are up to date. JOSM does not have to download newer versions."),
+                    tr("Plugins up to date"),
+                    JOptionPane.INFORMATION_MESSAGE,
+                    null // FIXME: provide help context
+            );
+        }
+
         public void actionPerformed(ActionEvent e) {
-            List<PluginInformation> toUpdate = model.getSelectedPlugins();
+            final List<PluginInformation> toUpdate = model.getSelectedPlugins();
             // the async task for downloading plugins
             final PluginDownloadTask pluginDownloadTask = new PluginDownloadTask(
@@ -345 +355 @@
                     notifyDownloadResults(pluginDownloadTask);
                     model.refreshLocalPluginVersion(pluginDownloadTask.getDownloadedPlugins());
+                    model.clearPendingPlugins(pluginDownloadTask.getDownloadedPlugins());
                     pnlPluginPreferences.refreshView();
                 }
@@ -355 +366 @@
                     if (pluginInfoDownloadTask.isCanceled())
                         return;
+                    model.updateAvailablePlugins(pluginInfoDownloadTask.getAvailabePlugins());
+                    // select plugins which actually have to be updated
+                    //
+                    Iterator<PluginInformation> it = toUpdate.iterator();
+                    while(it.hasNext()) {
+                        PluginInformation pi = it.next();
+                        if (!pi.isUpdateRequired()) {
+                            it.remove();
+                        }
+                    }
+                    if (toUpdate.isEmpty()) {
+                        alertNothingToUpdate();
+                        return;
+                    }
+                    pluginDownloadTask.setPluginsToDownload(toUpdate);
                     Main.worker.submit(pluginDownloadTask);
                     Main.worker.submit(pluginDownloadContinuation);

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

@@ -74 +74 @@
     }
 
+    protected  void updateAvailablePlugin(PluginInformation other) {
+        if (other == null) return;
+        PluginInformation pi = getPluginInformation(other.name);
+        if (pi == null) {
+            availablePlugins.add(other);
+            return;
+        }
+        pi.updateFromPluginSite(other);
+    }
+
+    /**
+     * Updates the list of plugin information objects with new information from
+     * plugin update sites.
+     * 
+     * @param fromPluginSite plugin information read from plugin update sites
+     */
+    public void updateAvailablePlugins(Collection<PluginInformation> fromPluginSite) {
+        for (PluginInformation other: fromPluginSite) {
+            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();
+    }
+
     /**
      * Replies the list of selected plugin information objects
@@ -113 +148 @@
                 new Comparator<PluginInformation>() {
                     public int compare(PluginInformation o1, PluginInformation o2) {
-                        String n1 = o1.getName() == null ? "" : o1.getName();
-                        String n2 = o2.getName() == null ? "" : o2.getName();
+                        String n1 = o1.getName() == null ? "" : o1.getName().toLowerCase();
+                        String n2 = o2.getName() == null ? "" : o2.getName().toLowerCase();
                         return n1.compareTo(n2);
                     }
@@ -164 +199 @@
         if (!selected) {
             pendingDownloads.remove(name);
+        }
+    }
+
+    /**
+     * Removes all the plugin in {@code plugins} from the list of plugins
+     * with a pending download
+     * 
+     * @param plugins the list of plugins to clear for a pending download
+     */
+    public void clearPendingPlugins(Collection<PluginInformation> plugins){
+        if (plugins == null || plugins.isEmpty()) return;
+        for(PluginInformation pi: plugins) {
+            pendingDownloads.remove(pi.name);
         }
     }