Changeset 14138 in josm for trunk/src/org/openstreetmap/josm/actions/RestartAction.java

Timestamp:

2018-08-12T02:21:19+02:00 (8 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate Main.platform and related methods - new class PlatformManager

File:

• trunk/src/org/openstreetmap/josm/actions/RestartAction.java (modified) (4 diffs)

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

@@ -16 +16 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -24 +23 @@
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.PlatformManager;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -92 +92 @@
         final List<String> cmd;
         // special handling for OSX .app package
-        if (Main.isPlatformOsx() && getSystemProperty("java.library.path").contains("/JOSM.app/Contents/MacOS")) {
+        if (PlatformManager.isPlatformOsx() && getSystemProperty("java.library.path").contains("/JOSM.app/Contents/MacOS")) {
             cmd = getAppleCommands();
         } else {
@@ -177 +177 @@
     private static String getJavaRuntime() throws IOException {
         final String java = getSystemProperty("java.home") + File.separator + "bin" + File.separator +
-                (Main.isPlatformWindows() ? "java.exe" : "java");
+                (PlatformManager.isPlatformWindows() ? "java.exe" : "java");
         if (!new File(java).isFile()) {
             throw new IOException("Unable to find suitable java runtime at "+java);