Changeset 299 in josm for src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

Timestamp:

2007-08-08T02:59:36+02:00 (17 years ago)

Author:

imi

Message:

• added update of plugins

File:

• src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified) (11 diffs)

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

@@ -1 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.gui.preferences;
 
@@ -14 +14 @@
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Map;
+import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -50 +52 @@
                 public String description;
                 public String resource;
-                public PluginDescription(String name, String description, String resource) {
+                public String version;
+                public PluginDescription(String name, String description, String resource, String version) {
                         this.name = name;
                         this.description = description;
                         this.resource = resource;
-        }
+                        this.version = version;
+                }
                 public PluginDescription() {
-        }
-        }
-        
+                }
+        }
+
         private Map<PluginDescription, Boolean> pluginMap;
         private Box pluginPanel = Box.createVerticalBox();
@@ -75 +79 @@
                         public void actionPerformed(ActionEvent e) {
                                 int count = PluginDownloader.downloadDescription();
-                        if (count > 0)
-                                JOptionPane.showMessageDialog(Main.parent,
-                                                trn("Downloaded plugin information from {0} site",
-                                                                "Downloaded plugin information from {0} sites", count, count));
-                        else
-                                JOptionPane.showMessageDialog(Main.parent, tr("No plugin information found."));
-                        refreshPluginPanel(gui);
-            }
+                                if (count > 0)
+                                        JOptionPane.showMessageDialog(Main.parent,
+                                                        trn("Downloaded plugin information from {0} site",
+                                                                        "Downloaded plugin information from {0} sites", count, count));
+                                else
+                                        JOptionPane.showMessageDialog(Main.parent, tr("No plugin information found."));
+                                refreshPluginPanel(gui);
+                        }
                 });
                 plugin.add(morePlugins, GBC.std().insets(0,0,10,0));
-                
+
                 JButton update = new JButton(tr("Update current"));
                 update.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent e) {
-                                JOptionPane.showMessageDialog(Main.parent, tr("Not implemented yet."));
-            }
-                });
-                //TODO: plugin.add(update, GBC.std().insets(0,0,10,0));
+                                update();
+                        }
+
+                });
+                plugin.add(update, GBC.std().insets(0,0,10,0));
 
                 JButton configureSites = new JButton(tr("Configure Plugin Sites"));
@@ -98 +103 @@
                         public void actionPerformed(ActionEvent e) {
                                 JOptionPane.showMessageDialog(Main.parent, tr("Not implemented yet."));
-            }
+                        }
                 });
                 //TODO: plugin.add(configureSites, GBC.std());
@@ -105 +110 @@
         }
 
+        private void update() {
+                Set<PluginDescription> toUpdate = new HashSet<PluginDescription>();
+                StringBuilder toUpdateStr = new StringBuilder();
+                for (PluginProxy proxy : Main.plugins) {
+                        PluginDescription description = findDescription(proxy.info.name);
+                        if (description != null && (description.version == null || description.version.equals("")) ? (proxy.info.version != null && proxy.info.version.equals("")) : !description.version.equals(proxy.info.version)) {
+                                toUpdate.add(description);
+                                toUpdateStr.append(description.name+"\n");
+                        }
+                }
+                if (toUpdate.isEmpty()) {
+                        JOptionPane.showMessageDialog(Main.parent, tr("All installed plugins are up to date."));
+                        return;
+                }
+                int answer = JOptionPane.showConfirmDialog(Main.parent, tr("Update the following plugins:\n\n{0}", toUpdateStr.toString()), tr("Update"), JOptionPane.OK_CANCEL_OPTION);
+                if (answer != JOptionPane.OK_OPTION)
+                        return;
+                PluginDownloader.update(toUpdate);
+        }
+
+        private PluginDescription findDescription(String name) {
+                for (PluginDescription d : pluginMap.keySet())
+                        if (d.name.equals(name))
+                                return d;
+                return null;
+        }
+
         private void refreshPluginPanel(final PreferenceDialog gui) {
-            Collection<PluginDescription> availablePlugins = getAvailablePlugins();
-            pluginMap = new HashMap<PluginDescription, Boolean>();
-            pluginPanel.removeAll();
+                Collection<PluginDescription> availablePlugins = getAvailablePlugins();
+                pluginMap = new HashMap<PluginDescription, Boolean>();
+                pluginPanel.removeAll();
                 Collection<String> enabledPlugins = Arrays.asList(Main.pref.get("plugins").split(","));
                 for (final PluginDescription plugin : availablePlugins) {
                         boolean enabled = enabledPlugins.contains(plugin.name);
-                        final JCheckBox pluginCheck = new JCheckBox(plugin.name, enabled);
+                        final JCheckBox pluginCheck = new JCheckBox(plugin.name+(plugin.version != null && !plugin.version.equals("") ? " Version: "+plugin.version : ""), enabled);
                         pluginPanel.add(pluginCheck);
 
@@ -130 +162 @@
                 }
                 plugin.updateUI();
-    }
+        }
 
         private Collection<PluginDescription> getAvailablePlugins() {
                 SortedMap<String, PluginDescription> availablePlugins = new TreeMap<String, PluginDescription>(new Comparator<String>(){
                         public int compare(String o1, String o2) {
-                    return o1.compareToIgnoreCase(o2);
-            }
+                                return o1.compareToIgnoreCase(o2);
+                        }
                 });
                 for (String location : PluginInformation.getPluginLocations()) {
@@ -148 +180 @@
                                                 try {
                                                         PluginInformation info = new PluginInformation(f);
-                                    availablePlugins.put(info.name, new PluginDescription(info.name, info.description, PluginInformation.getURLString(f.getPath())));
-                            } catch (PluginException x) {
-                            }
+                                                        if (!availablePlugins.containsKey(info.name))
+                                                                availablePlugins.put(info.name, new PluginDescription(info.name, info.description, PluginInformation.getURLString(f.getPath()), info.version));
+                                                } catch (PluginException x) {
+                                                }
                                         } else if (f.getName().matches("^[0-9]+-site.*\\.xml$")) {
                                                 try {
-                                Uniform<PluginDescription> parser = new Uniform<PluginDescription>(new FileReader(f), "plugin", PluginDescription.class);
-                                for (PluginDescription pd : parser)
-                                        if (!availablePlugins.containsKey(pd.name))
-                                                availablePlugins.put(pd.name, pd);
-                        } catch (Exception e) {
-                                e.printStackTrace();
-                                JOptionPane.showMessageDialog(Main.parent, tr("Error reading plugin information file: {0}", f.getName()));
-                        }
+                                                        Uniform<PluginDescription> parser = new Uniform<PluginDescription>(new FileReader(f), "plugin", PluginDescription.class);
+                                                        for (PluginDescription pd : parser)
+                                                                if (!availablePlugins.containsKey(pd.name))
+                                                                        availablePlugins.put(pd.name, pd);
+                                                } catch (Exception e) {
+                                                        e.printStackTrace();
+                                                        JOptionPane.showMessageDialog(Main.parent, tr("Error reading plugin information file: {0}", f.getName()));
+                                                }
                                         }
                                 }
@@ -170 +203 @@
                                                 proxy.info.name, 
                                                 proxy.info.description, 
-                                                proxy.info.file == null ? null : PluginInformation.getURLString(proxy.info.file.getPath())));
-            return availablePlugins.values();
-    }
+                                                proxy.info.file == null ? null : PluginInformation.getURLString(proxy.info.file.getPath()),
+                                                                proxy.info.version));
+                return availablePlugins.values();
+        }
 
         public void ok() {
@@ -195 +229 @@
                                         if (!PluginDownloader.downloadPlugin(pd))
                                                 pluginMap.put(pd, false);
-                                                
+
                 }
 
@@ -204 +238 @@
                 if (plugins.endsWith(","))
                         plugins = plugins.substring(0, plugins.length()-1);
-                
+
                 String oldPlugins = Main.pref.get("plugins");
                 if (!plugins.equals(oldPlugins)) {