Index: trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- trunk/src/org/openstreetmap/josm/Main.java (revision 12627) +++ trunk/src/org/openstreetmap/josm/Main.java (revision 12629) @@ -4,8 +4,6 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import java.awt.BorderLayout; import java.awt.Component; import java.awt.GraphicsEnvironment; -import java.awt.event.KeyEvent; import java.io.File; import java.io.IOException; @@ -43,5 +41,4 @@ import javax.swing.UnsupportedLookAndFeelException; -import org.openstreetmap.gui.jmapviewer.FeatureAdapter; import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.actions.OpenFileAction; @@ -63,5 +60,4 @@ import org.openstreetmap.josm.data.projection.Projection; import org.openstreetmap.josm.data.projection.ProjectionChangeListener; -import org.openstreetmap.josm.data.validation.OsmValidator; import org.openstreetmap.josm.gui.MainMenu; import org.openstreetmap.josm.gui.MainPanel; @@ -73,13 +69,9 @@ import org.openstreetmap.josm.gui.layer.MainLayerManager; import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener; -import org.openstreetmap.josm.gui.layer.TMSLayer; import org.openstreetmap.josm.gui.preferences.ToolbarPreferences; import org.openstreetmap.josm.gui.preferences.display.LafPreference; -import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference; -import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference; import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference; import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor; import org.openstreetmap.josm.gui.progress.ProgressMonitorExecutor; -import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets; import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.gui.util.RedirectInputMap; @@ -87,6 +79,4 @@ import org.openstreetmap.josm.io.OnlineResource; import org.openstreetmap.josm.io.OsmApi; -import org.openstreetmap.josm.io.OsmApiInitializationException; -import org.openstreetmap.josm.io.OsmTransferCanceledException; import org.openstreetmap.josm.plugins.PluginHandler; import org.openstreetmap.josm.tools.CheckParameterUtil; @@ -95,14 +85,10 @@ import org.openstreetmap.josm.tools.JosmRuntimeException; import org.openstreetmap.josm.tools.Logging; -import org.openstreetmap.josm.tools.OpenBrowser; import org.openstreetmap.josm.tools.OsmUrlToBounds; -import org.openstreetmap.josm.tools.OverpassTurboQueryWizard; import org.openstreetmap.josm.tools.PlatformHook; import org.openstreetmap.josm.tools.PlatformHookOsx; import org.openstreetmap.josm.tools.PlatformHookUnixoid; import org.openstreetmap.josm.tools.PlatformHookWindows; -import org.openstreetmap.josm.tools.RightAndLefthandTraffic; import org.openstreetmap.josm.tools.Shortcut; -import org.openstreetmap.josm.tools.Territories; import org.openstreetmap.josm.tools.Utils; import org.openstreetmap.josm.tools.bugreport.BugReport; @@ -558,61 +544,17 @@ */ public void initialize() { - fileWatcher.start(); - - new InitializationTask(tr("Executing platform startup hook"), platform::startupHook).call(); - - new InitializationTask(tr("Building main menu"), this::initializeMainWindow).call(); - - undoRedo.addCommandQueueListener(redoUndoListener); - - // creating toolbar - GuiHelper.runInEDTAndWait(() -> contentPanePrivate.add(toolbar.control, BorderLayout.NORTH)); - - registerActionShortcut(menu.help, Shortcut.registerShortcut("system:help", tr("Help"), - KeyEvent.VK_F1, Shortcut.DIRECT)); - - // This needs to be done before RightAndLefthandTraffic::initialize is called - try { - new InitializationTask(tr("Initializing internal boundaries data"), Territories::initialize).call(); - } catch (JosmRuntimeException e) { - // Can happen if the current projection needs NTV2 grid which is not available - // In this case we want the user be able to change his projection - BugReport.intercept(e).warn(); - } - - // contains several initialization tasks to be executed (in parallel) by a ExecutorService - List> tasks = new ArrayList<>(); - - tasks.add(new InitializationTask(tr("Initializing OSM API"), () -> { - // We try to establish an API connection early, so that any API - // capabilities are already known to the editor instance. However - // if it goes wrong that's not critical at this stage. - try { - OsmApi.getOsmApi().initialize(null, true); - } catch (OsmTransferCanceledException | OsmApiInitializationException e) { - Logging.warn(getErrorMessage(Utils.getRootCause(e))); - } - })); - - tasks.add(new InitializationTask(tr("Initializing internal traffic data"), RightAndLefthandTraffic::initialize)); - - tasks.add(new InitializationTask(tr("Initializing validator"), OsmValidator::initialize)); - - tasks.add(new InitializationTask(tr("Initializing presets"), TaggingPresets::initialize)); - - tasks.add(new InitializationTask(tr("Initializing map styles"), MapPaintPreference::initialize)); - - tasks.add(new InitializationTask(tr("Loading imagery preferences"), ImageryPreference::initialize)); - + // Initializes tasks that must be run before parallel tasks + runInitializationTasks(beforeInitializationTasks()); + + // Initializes tasks to be executed (in parallel) by a ExecutorService try { ExecutorService service = Executors.newFixedThreadPool( Runtime.getRuntime().availableProcessors(), Utils.newThreadFactory("main-init-%d", Thread.NORM_PRIORITY)); - for (Future i : service.invokeAll(tasks)) { + for (Future i : service.invokeAll(parallelInitializationTasks())) { i.get(); } // asynchronous initializations to be completed eventually - service.submit((Runnable) TMSLayer::getCache); - service.submit((Runnable) OsmValidator::initializeTests); - service.submit(OverpassTurboQueryWizard::getInstance); + asynchronousRunnableTasks().forEach(service::submit); + asynchronousCallableTasks().forEach(service::submit); service.shutdown(); } catch (InterruptedException | ExecutionException ex) { @@ -620,14 +562,62 @@ } - // hooks for the jmapviewer component - FeatureAdapter.registerBrowserAdapter(OpenBrowser::displayUrl); - FeatureAdapter.registerTranslationAdapter(I18n.getTranslationAdapter()); - FeatureAdapter.registerLoggingAdapter(name -> Logging.getLogger()); - - new InitializationTask(tr("Updating user interface"), () -> GuiHelper.runInEDTAndWait(() -> { - toolbar.refreshToolbarControl(); - toolbar.control.updateUI(); - contentPanePrivate.updateUI(); - })).call(); + // Initializes tasks that must be run after parallel tasks + runInitializationTasks(afterInitializationTasks()); + } + + private static void runInitializationTasks(List tasks) { + for (InitializationTask task : tasks) { + try { + task.call(); + } catch (JosmRuntimeException e) { + // Can happen if the current projection needs NTV2 grid which is not available + // In this case we want the user be able to change his projection + BugReport.intercept(e).warn(); + } + } + } + + /** + * Returns tasks that must be run before parallel tasks. + * @return tasks that must be run before parallel tasks + * @see #afterInitializationTasks + * @see #parallelInitializationTasks + */ + protected List beforeInitializationTasks() { + return Collections.emptyList(); + } + + /** + * Returns tasks to be executed (in parallel) by a ExecutorService. + * @return tasks to be executed (in parallel) by a ExecutorService + */ + protected Collection parallelInitializationTasks() { + return Collections.emptyList(); + } + + /** + * Returns asynchronous callable initializations to be completed eventually + * @return asynchronous callable initializations to be completed eventually + */ + protected List> asynchronousCallableTasks() { + return Collections.emptyList(); + } + + /** + * Returns asynchronous runnable initializations to be completed eventually + * @return asynchronous runnable initializations to be completed eventually + */ + protected List asynchronousRunnableTasks() { + return Collections.emptyList(); + } + + /** + * Returns tasks that must be run after parallel tasks. + * @return tasks that must be run after parallel tasks + * @see #beforeInitializationTasks + * @see #parallelInitializationTasks + */ + protected List afterInitializationTasks() { + return Collections.emptyList(); } @@ -638,10 +628,15 @@ protected abstract void initializeMainWindow(); - static final class InitializationTask implements Callable { + protected static final class InitializationTask implements Callable { private final String name; private final Runnable task; - protected InitializationTask(String name, Runnable task) { + /** + * Constructs a new {@code InitializationTask}. + * @param name translated name to be displayed to user + * @param task runnable initialization task + */ + public InitializationTask(String name, Runnable task) { this.name = name; this.task = task; Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 12627) +++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 12629) @@ -5,5 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.trn; +import java.awt.BorderLayout; import java.awt.Dimension; +import java.awt.event.KeyEvent; import java.io.File; import java.io.IOException; @@ -33,4 +35,5 @@ import java.util.Set; import java.util.TreeSet; +import java.util.concurrent.Callable; import java.util.logging.Level; import java.util.stream.Collectors; @@ -44,4 +47,5 @@ import org.jdesktop.swinghelper.debug.CheckThreadViolationRepaintManager; +import org.openstreetmap.gui.jmapviewer.FeatureAdapter; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.PreferencesAction; @@ -50,9 +54,14 @@ import org.openstreetmap.josm.data.CustomConfigurator; import org.openstreetmap.josm.data.Version; +import org.openstreetmap.josm.data.validation.OsmValidator; import org.openstreetmap.josm.gui.ProgramArguments.Option; import org.openstreetmap.josm.gui.SplashScreen.SplashProgressMonitor; import org.openstreetmap.josm.gui.download.DownloadDialog; +import org.openstreetmap.josm.gui.layer.TMSLayer; +import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference; +import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference; import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder; import org.openstreetmap.josm.gui.preferences.server.ProxyPreference; +import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets; import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.io.CertificateAmendment; @@ -60,4 +69,7 @@ import org.openstreetmap.josm.io.MessageNotifier; import org.openstreetmap.josm.io.OnlineResource; +import org.openstreetmap.josm.io.OsmApi; +import org.openstreetmap.josm.io.OsmApiInitializationException; +import org.openstreetmap.josm.io.OsmTransferCanceledException; import org.openstreetmap.josm.io.auth.CredentialsManager; import org.openstreetmap.josm.io.auth.DefaultAuthenticator; @@ -70,6 +82,11 @@ import org.openstreetmap.josm.tools.I18n; import org.openstreetmap.josm.tools.Logging; +import org.openstreetmap.josm.tools.OpenBrowser; import org.openstreetmap.josm.tools.OsmUrlToBounds; +import org.openstreetmap.josm.tools.OverpassTurboQueryWizard; import org.openstreetmap.josm.tools.PlatformHookWindows; +import org.openstreetmap.josm.tools.RightAndLefthandTraffic; +import org.openstreetmap.josm.tools.Shortcut; +import org.openstreetmap.josm.tools.Territories; import org.openstreetmap.josm.tools.Utils; import org.openstreetmap.josm.tools.WindowGeometry; @@ -95,5 +112,4 @@ */ public MainApplication() { - // Allow subclassing (see JOSM.java) this(null); } @@ -106,4 +122,75 @@ public MainApplication(MainFrame mainFrame) { this.mainFrame = mainFrame; + } + + @Override + protected List beforeInitializationTasks() { + return Arrays.asList( + new InitializationTask(tr("Starting file watcher"), fileWatcher::start), + new InitializationTask(tr("Executing platform startup hook"), platform::startupHook), + new InitializationTask(tr("Building main menu"), this::initializeMainWindow), + new InitializationTask(tr("Updating user interface"), () -> { + undoRedo.addCommandQueueListener(redoUndoListener); + // creating toolbar + GuiHelper.runInEDTAndWait(() -> contentPanePrivate.add(toolbar.control, BorderLayout.NORTH)); + // help shortcut + registerActionShortcut(menu.help, Shortcut.registerShortcut("system:help", tr("Help"), + KeyEvent.VK_F1, Shortcut.DIRECT)); + }), + // This needs to be done before RightAndLefthandTraffic::initialize is called + new InitializationTask(tr("Initializing internal boundaries data"), Territories::initialize) + ); + } + + @Override + protected Collection parallelInitializationTasks() { + return Arrays.asList( + new InitializationTask(tr("Initializing OSM API"), () -> { + // We try to establish an API connection early, so that any API + // capabilities are already known to the editor instance. However + // if it goes wrong that's not critical at this stage. + try { + OsmApi.getOsmApi().initialize(null, true); + } catch (OsmTransferCanceledException | OsmApiInitializationException e) { + Logging.warn(Logging.getErrorMessage(Utils.getRootCause(e))); + } + }), + new InitializationTask(tr("Initializing internal traffic data"), RightAndLefthandTraffic::initialize), + new InitializationTask(tr("Initializing validator"), OsmValidator::initialize), + new InitializationTask(tr("Initializing presets"), TaggingPresets::initialize), + new InitializationTask(tr("Initializing map styles"), MapPaintPreference::initialize), + new InitializationTask(tr("Loading imagery preferences"), ImageryPreference::initialize) + ); + } + + @Override + protected List> asynchronousCallableTasks() { + return Arrays.asList( + OverpassTurboQueryWizard::getInstance + ); + } + + @Override + protected List asynchronousRunnableTasks() { + return Arrays.asList( + TMSLayer::getCache, + OsmValidator::initializeTests + ); + } + + @Override + protected List afterInitializationTasks() { + return Arrays.asList( + new InitializationTask(tr("Updating user interface"), () -> GuiHelper.runInEDTAndWait(() -> { + // hooks for the jmapviewer component + FeatureAdapter.registerBrowserAdapter(OpenBrowser::displayUrl); + FeatureAdapter.registerTranslationAdapter(I18n.getTranslationAdapter()); + FeatureAdapter.registerLoggingAdapter(name -> Logging.getLogger()); + // UI update + toolbar.refreshToolbarControl(); + toolbar.control.updateUI(); + contentPanePrivate.updateUI(); + })) + ); }