Changeset 14140 in josm for trunk/src/org/openstreetmap/josm/spi/lifecycle

Timestamp:

2018-08-12T13:08:27+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - move Main* termination methods to lifecycle SPI + new class MainTermination

File:

• trunk/src/org/openstreetmap/josm/spi/lifecycle/Lifecycle.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/spi/lifecycle/Lifecycle.java

@@ -9 +9 @@
 import java.util.concurrent.Future;
 
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -20 +21 @@
 
     private static volatile InitStatusListener initStatusListener;
+
+    private static volatile Runnable shutdownSequence;
 
     private Lifecycle() {
@@ -39 +42 @@
     public static void setInitStatusListener(InitStatusListener listener) {
         initStatusListener = Objects.requireNonNull(listener);
+    }
+
+    /**
+     * Gets shutdown sequence.
+     * @return shutdown sequence
+     * @since 14140
+     */
+    public static Runnable getShutdownSequence() {
+        return shutdownSequence;
+    }
+
+    /**
+     * Sets shutdown sequence.
+     * @param sequence shutdown sequence. Must not be null
+     * @since 14140
+     */
+    public static void setShutdownSequence(Runnable sequence) {
+        shutdownSequence = Objects.requireNonNull(sequence);
     }
 
@@ -66 +87 @@
             }
         } catch (InterruptedException | ExecutionException ex) {
-            throw new RuntimeException(ex);
+            throw new JosmRuntimeException(ex);
         }
 
@@ -77 +98 @@
             try {
                 task.call();
-            } catch (RuntimeException e) {
+            } 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
@@ -84 +105 @@
         }
     }
+
+    /**
+     * Closes JOSM and optionally terminates the Java Virtual Machine (JVM).
+     * @param exit If {@code true}, the JVM is terminated by running {@link System#exit} with a given return code.
+     * @param exitCode The return code
+     * @return {@code true}
+     * @since 14140
+     */
+    public static boolean exitJosm(boolean exit, int exitCode) {
+        if (shutdownSequence != null) {
+            shutdownSequence.run();
+        }
+
+        if (exit) {
+            System.exit(exitCode);
+        }
+        return true;
+    }
 }