Changeset 7487 in josm

Timestamp:

2014-09-03T21:57:20+02:00 (10 years ago)

Author:

Don-vip

Message:

see #10455 - fix restart of OS X package + file icons

Location:

trunk

Files:

• macosx/JOSM.app/Contents/Info.plist_template.xml (modified) (4 diffs)
• src/org/openstreetmap/josm/actions/RestartAction.java (modified) (3 diffs)

trunk/macosx/JOSM.app/Contents/Info.plist_template.xml

@@ -10 +10 @@
         <string>JOSM File</string>
         <key>UTTypeIconFile</key>
-        <string>macosx/JOSM.app/Contents/Resources/JOSM.icns</string>
+        <string>JOSM.icns</string>
         <key>UTTypeReferenceURL</key>
         <string>http://wiki.openstreetmap.org/wiki/JOSM_file_format</string>
@@ -82 +82 @@
     <dict>
         <key>CFBundleTypeIconFile</key>
-        <string>macosx/JOSM.app/Contents/Resources/JOSM.icns</string>
+        <string>JOSM.icns</string>
         <key>CFBundleTypeName</key>
         <string>OSM Files</string>
@@ -105 +105 @@
     <dict>
         <key>CFBundleTypeIconFile</key>
-        <string>macosx/JOSM.app/Contents/Resources/JOSM.icns</string>
+        <string>JOSM.icns</string>
         <key>CFBundleTypeName</key>
         <string>GPX Files</string>
@@ -125 +125 @@
     <dict>
         <key>CFBundleTypeIconFile</key>
-        <string>macosx/JOSM.app/Contents/Resources/JOSM.icns</string>
+        <string>JOSM.icns</string>
         <key>CFBundleTypeName</key>
         <string>OSM Compressed Files</string>

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

@@ -12 +12 @@
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
@@ -27 +26 @@
  */
 public class RestartAction extends JosmAction {
+
+    // AppleScript to restart OS X package
+    private static final String RESTART_APPLE_SCRIPT =
+              "tell application \"System Events\"\n"
+            + "repeat until not (exists process \"JOSM\")\n"
+            + "delay 0.2\n"
+            + "end repeat\n"
+            + "end tell\n"
+            + "tell application \"JOSM\" to activate";
 
     /**
@@ -73 +81 @@
         if (isRestartSupported() && !Main.exitJosm(false, 0)) return;
         try {
-            // java binary
-            final String java = System.getProperty("java.home") + File.separator + "bin" + File.separator +
-                    (Main.isPlatformWindows() ? "java.exe" : "java");
-            if (!new File(java).isFile()) {
-                throw new IOException("Unable to find suitable java runtime at "+java);
+            final List<String> cmd = new ArrayList<>();
+            // special handling for OSX .app package
+            if (Main.isPlatformOsx() && System.getProperty("java.library.path").contains("/JOSM.app/Contents/MacOS")) {
+                cmd.add("/usr/bin/osascript");
+                for (String line : RESTART_APPLE_SCRIPT.split("\n")) {
+                    cmd.add("-e");
+                    cmd.add(line);
+                }
+            } else {
+                // java binary
+                final String java = System.getProperty("java.home") + File.separator + "bin" + File.separator +
+                        (Main.isPlatformWindows() ? "java.exe" : "java");
+                if (!new File(java).isFile()) {
+                    throw new IOException("Unable to find suitable java runtime at "+java);
+                }
+                cmd.add(java);
+                // vm arguments
+                for (String arg : ManagementFactory.getRuntimeMXBean().getInputArguments()) {
+                    // if it's the agent argument : we ignore it otherwise the
+                    // address of the old application and the new one will be in conflict
+                    if (!arg.contains("-agentlib")) {
+                        cmd.add(arg);
+                    }
+                }
+                // program main and program arguments (be careful a sun property. might not be supported by all JVM)
+                String[] mainCommand = System.getProperty("sun.java.command").split(" ");
+                // look for a .jar in all chunks to support paths with spaces (fix #9077)
+                String jarPath = mainCommand[0];
+                for (int i = 1; i < mainCommand.length && !jarPath.endsWith(".jar"); i++) {
+                    jarPath += " " + mainCommand[i];
+                }
+                // program main is a jar
+                if (jarPath.endsWith(".jar")) {
+                    // if it's a jar, add -jar mainJar
+                    cmd.add("-jar");
+                    cmd.add(new File(jarPath).getPath());
+                } else {
+                    // else it's a .class, add the classpath and mainClass
+                    cmd.add("-cp");
+                    cmd.add("\"" + System.getProperty("java.class.path") + "\"");
+                    cmd.add(mainCommand[0]);
+                }
+                // if it's webstart add JNLP file
+                String jnlp = System.getProperty("jnlp.application.href");
+                if (jnlp != null) {
+                    cmd.add(jnlp);
+                }
+                // finally add program arguments
+                cmd.addAll(Arrays.asList(Main.commandLineArgs));
             }
-            final List<String> cmd = new ArrayList<>(Collections.singleton(java));
-            // vm arguments
-            for (String arg : ManagementFactory.getRuntimeMXBean().getInputArguments()) {
-                // if it's the agent argument : we ignore it otherwise the
-                // address of the old application and the new one will be in conflict
-                if (!arg.contains("-agentlib")) {
-                    cmd.add(arg);
-                }
-            }
-            // program main and program arguments (be careful a sun property. might not be supported by all JVM)
-            String[] mainCommand = System.getProperty("sun.java.command").split(" ");
-            // look for a .jar in all chunks to support paths with spaces (fix #9077)
-            String jarPath = mainCommand[0];
-            for (int i = 1; i < mainCommand.length && !jarPath.endsWith(".jar"); i++) {
-                jarPath += " " + mainCommand[i];
-            }
-            // program main is a jar
-            if (jarPath.endsWith(".jar")) {
-                // if it's a jar, add -jar mainJar
-                cmd.add("-jar");
-                cmd.add(new File(jarPath).getPath());
-            } else {
-                // else it's a .class, add the classpath and mainClass
-                cmd.add("-cp");
-                cmd.add("\"" + System.getProperty("java.class.path") + "\"");
-                cmd.add(mainCommand[0]);
-            }
-            // if it's webstart add JNLP file
-            String jnlp = System.getProperty("jnlp.application.href");
-            if (jnlp != null) {
-                cmd.add(jnlp);
-            }
-            // finally add program arguments
-            cmd.addAll(Arrays.asList(Main.commandLineArgs));
             Main.info("Restart "+cmd);
             // execute the command in a shutdown hook, to be sure that all the