Changeset 6125 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-08-09T16:08:30+02:00 (11 years ago)

Author:

bastiK

Message:

see #7275 - allow script to handle restart

When JOSM was started with parameter -Djosm.restart=true, a
user request for restart will simply terminate the application
with exit code 9.
The start script is then responsible for the restart.

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/ExitAction.java (modified) (1 diff)
• actions/RestartAction.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (1 diff)
• tools/PlatformHookOsx.java (modified) (1 diff)

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

@@ -747 +747 @@
      * @since 3378
      */
-    public static boolean exitJosm(boolean exit) {
+    public static boolean exitJosm(boolean exit, int exitCode) {
         if (Main.saveUnsavedModifications()) {
             geometry.remember("gui.geometry");
@@ -762 +762 @@
             }
             if (exit) {
-                System.exit(0);
+                System.exit(exitCode);
             }
             return true;

trunk/src/org/openstreetmap/josm/actions/ExitAction.java

@@ -28 +28 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        Main.exitJosm(true);
+        Main.exitJosm(true, 0);
     }
 }

trunk/src/org/openstreetmap/josm/actions/RestartAction.java

@@ -43 +43 @@
     @Override
     public void actionPerformed(ActionEvent e) {
+        // If JOSM has been started with property 'josm.restart=true' this means
+        // it is executed by a start script that can handle restart.
+        // Request for restart is indicated by exit code 9.
+        String scriptRestart = System.getProperty("josm.restart");
+        if ("true".equals(scriptRestart)) {
+            Main.exitJosm(true, 9);
+        }
+        
         try {
             restartJOSM();
@@ -64 +72 @@
      */
     public static void restartJOSM() throws IOException {
-        if (isRestartSupported() && !Main.exitJosm(false)) return;
+        if (isRestartSupported() && !Main.exitJosm(false, 0)) return;
         try {
             // java binary

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

@@ -84 +84 @@
         mainFrame.addWindowListener(new WindowAdapter(){
             @Override public void windowClosing(final WindowEvent arg0) {
-                Main.exitJosm(true);
+                Main.exitJosm(true, 0);
             }
         });

trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

@@ -51 +51 @@
         //System.out.println("Going to handle method "+method+" (short: "+method.getName()+") with event "+args[0]);
         if (method.getName().equals("handleQuit")) {
-            handled = Main.exitJosm(false);
+            handled = Main.exitJosm(false, 0);
         } else if (method.getName().equals("handleAbout")) {
             Main.main.menu.about.actionPerformed(null);