Changeset 2817 in josm for trunk/src/org/openstreetmap/josm/gui/MainApplication.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/MainApplication.java (modified) (3 diffs)

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

@@ -22 +22 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.DefaultProxySelector;
 import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
 import org.openstreetmap.josm.io.auth.DefaultAuthenticator;
 import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.tools.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.I18n;
@@ -45 +47 @@
      * display the frame.
      */
-    public MainApplication(JFrame mainFrame, SplashScreen splash) {
-        super(splash);
+    public MainApplication(JFrame mainFrame) {
+        super();
         mainFrame.setContentPane(contentPane);
         mainFrame.setJMenuBar(menu);
@@ -151 +153 @@
         }
 
-        SplashScreen splash = new SplashScreen(Main.pref.getBoolean("draw.splashscreen", true));
-
-        splash.setStatus(tr("Activating updated plugins"));
-        PluginHandler.earlyCleanup();
-
-        splash.setStatus(tr("Loading early plugins"));
-        PluginHandler.loadPlugins(true);
-
-        splash.setStatus(tr("Setting defaults"));
+        SplashScreen splash = new SplashScreen();
+        ProgressMonitor monitor = splash.getProgressMonitor();
+        monitor.beginTask(tr("Initializing"));
+        monitor.setTicksCount(7);
+        splash.setVisible(Main.pref.getBoolean("draw.splashscreen", true));
+
+        List<PluginInformation> pluginsToLoad = PluginHandler.buildListOfPluginsToLoad(monitor.createSubTaskMonitor(1, false));
+        if (!pluginsToLoad.isEmpty() && PluginHandler.checkAndConfirmPluginUpdate()) {
+            monitor.subTask(tr("Updating plugins..."));
+            PluginHandler.updatePlugins(pluginsToLoad, monitor.createSubTaskMonitor(1, false));
+        }
+        monitor.worked(1);
+
+        monitor.subTask(tr("Installing updated plugins"));
+        PluginHandler.installDownloadedPlugins();
+        monitor.worked(1);
+
+        monitor.subTask(tr("Loading early plugins"));
+        PluginHandler.loadEarlyPlugins(pluginsToLoad, monitor.createSubTaskMonitor(1, false));
+        monitor.worked(1);
+
+        monitor.subTask(tr("Setting defaults"));
         preConstructorInit(args);
         removeObsoletePreferences();
-        splash.setStatus(tr("Creating main GUI"));
+        monitor.worked(1);
+
+        monitor.indeterminateSubTask(tr("Creating main GUI"));
         JFrame mainFrame = new JFrame(tr("Java OpenStreetMap Editor"));
         Main.parent = mainFrame;
-        final Main main = new MainApplication(mainFrame, splash);
-        splash.setStatus(tr("Loading plugins"));
-        PluginHandler.loadPlugins(false);
+        final Main main = new MainApplication(mainFrame);
+        monitor.worked(1);
+
+        monitor.subTask(tr("Loading plugins"));
+        PluginHandler.loadLatePlugins(pluginsToLoad,  monitor.createSubTaskMonitor(1, false));
+        monitor.worked(1);
         toolbar.refreshToolbarControl();
-
+        splash.setVisible(false);
+        splash.dispose();
         mainFrame.setVisible(true);
-        splash.closeSplash();
 
         if (((!args.containsKey("no-maximize") && !args.containsKey("geometry")