Changeset 2372 in josm for trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java

Timestamp:

2009-11-01T14:14:52+01:00 (16 years ago)

Author:

stoecker

Message:

fix #3391 - update plugins after josm update

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java

@@ -39 +39 @@
         private String errors = "";
         private int count = 0;
+        private boolean restart;
 
-        private UpdateTask(Collection<PluginInformation> toUpdate, boolean up) {
+        private UpdateTask(Collection<PluginInformation> toUpdate, boolean up, boolean restart) {
             super(up ? tr("Update Plugins") : tr("Download Plugins"));
             this.toUpdate = toUpdate;
+            this.restart = restart;
         }
 
@@ -58 +60 @@
                 );
             } else {
+                String txt = trn("{0} Plugin successfully downloaded.", "{0} Plugins successfully downloaded.", count, count);
+                if(restart)
+                    txt += "\n"+tr("Please restart JOSM.");
+
                 JOptionPane.showMessageDialog(
                         Main.parent,
-                        trn("{0} Plugin successfully downloaded. Please restart JOSM.", "{0} Plugins successfully downloaded. Please restart JOSM.", count, count),
+                        txt,
                         tr("Information"),
                         JOptionPane.INFORMATION_MESSAGE
@@ -154 +160 @@
     }
 
-    public static void update(Collection<PluginInformation> update) {
-        Main.worker.execute(new UpdateTask(update, true));
+    public static void update(Collection<PluginInformation> update, boolean restart) {
+        Main.worker.execute(new UpdateTask(update, true, restart));
     }
 
@@ -162 +168 @@
         // Waiting for result is not a good idea because the waiting thread will probably be either EDT
         // or worker thread. Blocking one of these threads will cause deadlock
-        UpdateTask t = new UpdateTask(download, false);
+        UpdateTask t = new UpdateTask(download, false, true);
         t.run();
         return t.failed;