Changeset 14125 in josm for trunk/src/org

Timestamp:

2018-08-11T19:01:26+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - extract lifecycle Main classes to a new lifecycle SPI

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (3 diffs)
• gui/MainApplication.java (modified) (4 diffs)
• spi/lifecycle (added)
• spi/lifecycle/InitStatusListener.java (added)
• spi/lifecycle/InitializationTask.java (added)
• spi/lifecycle/Lifecycle.java (added)

trunk/src/org/openstreetmap/josm/Main.java

@@ -36 +36 @@
 import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
+import org.openstreetmap.josm.spi.lifecycle.InitializationTask;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.IUrls;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
@@ -87 +87 @@
      */
     public static volatile PlatformHook platform;
-
-    private static volatile InitStatusListener initListener;
-
-    /**
-     * Initialization task listener.
-     */
-    public interface InitStatusListener {
-
-        /**
-         * Called when an initialization task updates its status.
-         * @param event task name
-         * @return new status
-         */
-        Object updateStatus(String event);
-
-        /**
-         * Called when an initialization task completes.
-         * @param status final status
-         */
-        void finish(Object status);
-    }
-
-    /**
-     * Sets initialization task listener.
-     * @param listener initialization task listener
-     */
-    public static void setInitStatusListener(InitStatusListener listener) {
-        CheckParameterUtil.ensureParameterNotNull(listener);
-        initListener = listener;
-    }
 
     /**
@@ -217 +187 @@
     }
 
-    protected static final class InitializationTask implements Callable<Void> {
-
-        private final String name;
-        private final 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;
-        }
-
-        @Override
-        public Void call() {
-            Object status = null;
-            if (initListener != null) {
-                status = initListener.updateStatus(name);
-            }
-            task.run();
-            if (initListener != null) {
-                initListener.finish(status);
-            }
-            return null;
-        }
-    }
-
     /**
      * Replies the current selected OSM primitives, from a end-user point of view.

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

@@ -161 +161 @@
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.spi.lifecycle.InitStatusListener;
+import org.openstreetmap.josm.spi.lifecycle.InitializationTask;
+import org.openstreetmap.josm.spi.lifecycle.Lifecycle;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
@@ -318 +321 @@
         String location = Config.getUrls().getJOSMWebsite() + "/proj/" + gridFileName;
         // Try to load grid file
+        @SuppressWarnings("resource")
         CachedFile cf = new CachedFile(location);
         try {
@@ -667 +671 @@
     }
 
+    /**
+     * Redirects the key inputs from {@code source} to main content pane.
+     * @param source source component from which key inputs are redirected
+     */
     public static void redirectToMainContentPane(JComponent source) {
         RedirectInputMap.redirect(source, contentPanePrivate);
@@ -1045 +1053 @@
             GuiHelper.runInEDT(() -> splash.setVisible(Config.getPref().getBoolean("draw.splashscreen", true)));
         }
-        Main.setInitStatusListener(new InitStatusListener() {
+        Lifecycle.setInitStatusListener(new InitStatusListener() {
 
             @Override