Changeset 4681 in josm for trunk/src/org/openstreetmap/josm/gui/MainApplication.java

Timestamp:

2011-12-21T10:24:43+01:00 (14 years ago)

Author:

simon04

Message:

see #6329 - improve splash screen: show execution time of items, display more detailed information

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (2 diffs)

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

@@ -210 +210 @@
 
         SplashScreen splash = new SplashScreen();
-        ProgressMonitor monitor = splash.getProgressMonitor();
+        final ProgressMonitor monitor = splash.getProgressMonitor();
         monitor.beginTask(tr("Initializing"));
-        monitor.setTicksCount(7);
         splash.setVisible(Main.pref.getBoolean("draw.splashscreen", true));
+        Main.setInitStatusListener(new InitStatusListener() {
+
+            @Override
+            public void updateStatus(String event) {
+                monitor.indeterminateSubTask(event);
+            }
+        });
 
         List<PluginInformation> pluginsToLoad = PluginHandler.buildListOfPluginsToLoad(splash,monitor.createSubTaskMonitor(1, false));
         if (!pluginsToLoad.isEmpty() && PluginHandler.checkAndConfirmPluginUpdate(splash)) {
-            monitor.subTask(tr("Updating plugins..."));
+            monitor.subTask(tr("Updating plugins"));
             pluginsToLoad = PluginHandler.updatePlugins(splash,pluginsToLoad, monitor.createSubTaskMonitor(1, false));
         }
-        monitor.worked(1);
-
-        monitor.subTask(tr("Installing updated plugins"));
+
+        monitor.indeterminateSubTask(tr("Installing updated plugins"));
         PluginHandler.installDownloadedPlugins(true);
-        monitor.worked(1);
-
-        monitor.subTask(tr("Loading early plugins"));
+
+        monitor.indeterminateSubTask(tr("Loading early plugins"));
         PluginHandler.loadEarlyPlugins(splash,pluginsToLoad, monitor.createSubTaskMonitor(1, false));
-        monitor.worked(1);
-
-        monitor.subTask(tr("Setting defaults"));
+
+        monitor.indeterminateSubTask(tr("Setting defaults"));
         preConstructorInit(args);
         removeObsoletePreferences();
-        monitor.worked(1);
 
         monitor.indeterminateSubTask(tr("Creating main GUI"));
@@ -240 +242 @@
         Main.addListener();
         final Main main = new MainApplication(mainFrame);
-        monitor.worked(1);
-
-        monitor.subTask(tr("Loading plugins"));
+
+        monitor.indeterminateSubTask(tr("Loading plugins"));
         PluginHandler.loadLatePlugins(splash,pluginsToLoad,  monitor.createSubTaskMonitor(1, false));
-        monitor.worked(1);
         toolbar.refreshToolbarControl();
         splash.setVisible(false);