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

Timestamp:

2008-11-09T22:10:39+01:00 (15 years ago)

Author:

stoecker

Message:

added some plugin checks

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• PleaseWaitDialog.java (modified) (1 diff)
• preferences/PluginPreference.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java

@@ -35 +35 @@
                 pane.add(cancel, GBC.eol().anchor(GBC.CENTER));
                 setContentPane(pane);
-                setSize(400,100);
+                setSize(Main.pref.getInteger("progressdialog.size",400),100);
                 setLocationRelativeTo(Main.parent);
         }

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

@@ -198 +198 @@
         private void update() {
                 // refresh description
-                PluginDownloader.downloadDescription();
+                int num = PluginDownloader.downloadDescription();
+                Boolean done = false;
                 refreshPluginPanel(gui);
 
@@ -205 +206 @@
                 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)) {
+                        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");
@@ -212 +214 @@
                 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);
+                        done = true;
+                }
+                else
+                {
+                        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)
+                        {
+                                PluginDownloader.update(toUpdate);
+                                done = true;
+                        }
+                }
+                if(done && num >= 1)
+                        Main.pref.put("pluginmanager.lastupdate", Long.toString(System.currentTimeMillis()));
         }