Changeset 2817 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

Timestamp:

2010-01-11T21:06:49+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3063: Downloading a plugin yields 3 dialogs at the same time: Downloading plugin / You should restart JOSM / Plugin downloaded
fixed #3628: JOSM blocking itself updating broken plugin
fixed #4187: JOSM deleted random files from disk after start (data loss)
fixed #4199: new version - plugins update vs josm start [should be fixed. Be careful if you have two JOSM instances running. Auto-update of plugins in the second instance will fail because plugin files are locked by the first instance]
fixed #4034: JOSM should auto-download plugin list when it hasn't been downloaded before [JOSM now displays a hint]

fixed: splash screen showing again even if plugins are auto-updated
new: progress indication integrated in splash screen
new: cancelable, asynchronous download of plugins from preferences
new: cancelable, asynchronous download of plugin list from plugin download sites
new: asynchronous loading of plugin information, launch of preferences dialog accelerated
refactored: clean up, documentation of plugin management code (PluginHandler)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (modified) (3 diffs)

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

@@ -23 +23 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.plugins.PluginDownloadTask;
 import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.tools.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.GBC;
@@ -47 +50 @@
     public final JPanel map = createPreferenceTab("map", I18n.tr("Map Settings"), I18n.tr("Settings for the map projection and data interpretation."));
     public final JPanel audio = createPreferenceTab("audio", I18n.tr("Audio Settings"), I18n.tr("Settings for the audio player and audio markers."));
+    public final JPanel plugins = createPreferenceTab("plugin", tr("Plugins"), tr("Configure available plugins."), false);
 
     public final javax.swing.JTabbedPane displaycontent = new javax.swing.JTabbedPane();
@@ -95 +99 @@
     }
 
+    protected PluginPreference getPluginPreference() {
+        for (PreferenceSetting setting: settings) {
+            if (setting instanceof PluginPreference)
+                return (PluginPreference) setting;
+        }
+        return null;
+    }
+
     public void savePreferences() {
-        boolean requiresRestart = false;
-        for (PreferenceSetting setting : settings)
-        {
-            if(setting.ok()) {
-                requiresRestart = true;
+
+        // create a task for downloading plugins if the user has activated, yet not downloaded,
+        // new plugins
+        //
+        final PluginPreference preference = getPluginPreference();
+        final List<PluginInformation> toDownload = preference.getPluginsScheduledForUpdateOrDownload();
+        final PluginDownloadTask task;
+        if (! toDownload.isEmpty()) {
+            task = new PluginDownloadTask(this, toDownload, tr("Download plugins"));
+        } else {
+            task = null;
+        }
+
+        // this is the task which will run *after* the plugins are downloaded
+        //
+        final Runnable continuation = new Runnable() {
+            public void run() {
+                boolean requiresRestart = false;
+                if (task != null && !task.isCanceled()) {
+                    if (!task.getDownloadedPlugins().isEmpty()) {
+                        requiresRestart = true;
+                    }
+                }
+
+                for (PreferenceSetting setting : settings) {
+                    if (setting.ok()) {
+                        requiresRestart = true;
+                    }
+                }
+
+                // build the messages. We only display one message, including the status
+                // information from the plugin download task and - if necessary - a hint
+                // to restart JOSM
+                //
+                StringBuffer sb = new StringBuffer();
+                sb.append("<html>");
+                if (task != null && !task.isCanceled()) {
+                    sb.append(PluginPreference.buildDownloadSummary(task));
+                }
+                if (requiresRestart) {
+                    sb.append(tr("You have to restart JOSM for some settings to take effect."));
+                }
+                sb.append("</html>");
+
+                // display the message, if necessary
+                //
+                if ((task != null && !task.isCanceled()) || requiresRestart) {
+                    JOptionPane.showMessageDialog(
+                            Main.parent,
+                            sb.toString(),
+                            tr("Warning"),
+                            JOptionPane.WARNING_MESSAGE
+                    );
+                }
+                Main.parent.repaint();
             }
-        }
-        if (requiresRestart) {
-            JOptionPane.showMessageDialog(
-                    Main.parent,
-                    tr("You have to restart JOSM for some settings to take effect."),
-                    tr("Warning"),
-                    JOptionPane.WARNING_MESSAGE
+        };
+
+        if (task != null) {
+            // if we have to launch a plugin download task we do it asynchronously, followed
+            // by the remaining "save preferences" activites run on the Swing EDT.
+            //
+            Main.worker.submit(task);
+            Main.worker.submit(
+                    new Runnable() {
+                        public void run() {
+                            SwingUtilities.invokeLater(continuation);
+                        }
+                    }
             );
-        }
-        Main.parent.repaint();
+        } else {
+            // no need for asynchronous activities. Simply run the remaining "save preference"
+            // activities on this thread (we are already on the Swing EDT
+            //
+            continuation.run();
+        }
     }