Changeset 12217 in josm for trunk/src/org/openstreetmap/josm/tools/PlatformHook.java

Timestamp:

2017-05-20T17:11:37+02:00 (7 years ago)

Author:

Don-vip

Message:

see #14821 - workaround for JDK-8180379/JDK-8179014 : prevent JVM crash when opening a file chooser on Windows 10 Creators Update with Windows look & feel + add information about OS build number for Windows & macOS + add utilities to get Java update/build version numbers

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (modified) (3 diffs)

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

@@ -3 +3 @@
 
 import java.awt.GraphicsEnvironment;
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -140 +143 @@
 
     /**
+     * Returns OS build number.
+     * @return OS build number.
+     * @since 12217
+     */
+    default String getOSBuildNumber() {
+        return "";
+    }
+
+    /**
      * Setup system keystore to add JOSM HTTPS certificate (for remote control).
      * @param entryAlias The entry alias to use
@@ -172 +184 @@
 
     /**
+     * Executes a native command and returns the first line of standard output.
+     * @param command array containing the command to call and its arguments.
+     * @return first stripped line of standard output
+     * @throws IOException if an I/O error occurs
+     * @since 12217
+     */
+    default String exec(String... command) throws IOException {
+        Process p = Runtime.getRuntime().exec(command);
+        try (BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8))) {
+            return Utils.strip(input.readLine());
+        }
+    }
+
+    /**
      * Returns the platform-dependent default cache directory.
      * @return the platform-dependent default cache directory