Changeset 12217 in josm

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

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/PlatformHook.java (modified) (3 diffs)
• src/org/openstreetmap/josm/tools/PlatformHookOsx.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/PlatformHookWindows.java (modified) (5 diffs)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/WinRegistry.java (added)
• test/unit/org/openstreetmap/josm/tools/UtilsTest.java (modified) (1 diff)

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

@@ -84 +84 @@
         String runtimeVersion = System.getProperty("java.runtime.version");
         text.append(Version.getInstance().getReleaseAttributes())
-            .append("\nIdentification: ").append(Version.getInstance().getAgentString())
-            .append("\nMemory Usage: ")
+            .append("\nIdentification: ").append(Version.getInstance().getAgentString());
+        String buildNumber = Main.platform.getOSBuildNumber();
+        if (!buildNumber.isEmpty()) {
+            text.append("\nOS Build number: ").append(buildNumber);
+        }
+        text.append("\nMemory Usage: ")
             .append(Runtime.getRuntime().totalMemory()/1024/1024)
             .append(" MB / ")

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

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

@@ -32 +32 @@
 
     private static final PlatformHookOsx ivhandler = new PlatformHookOsx();
+
+    private String oSBuildNumber;
 
     @Override
@@ -386 +388 @@
     }
 
+    private String buildOSBuildNumber() {
+        StringBuilder sb = new StringBuilder();
+        try {
+            sb.append(exec("sw_vers", "-productName"))
+              .append(' ')
+              .append(exec("sw_vers", "-productVersion"))
+              .append(" (")
+              .append(exec("sw_vers", "-buildVersion"))
+              .append(')');
+        } catch (IOException e) {
+            Main.error(e);
+        }
+        return sb.toString();
+    }
+
+    @Override
+    public String getOSBuildNumber() {
+        if (oSBuildNumber == null) {
+            oSBuildNumber = buildOSBuildNumber();
+        }
+        return oSBuildNumber;
+    }
+
     @Override
     public File getDefaultCacheDirectory() {

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

@@ -10 +10 @@
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -207 +206 @@
                 // Try lsb_release (only available on LSB-compliant Linux systems,
                 // see https://www.linuxbase.org/lsb-cert/productdir.php?by_prod )
-                Process p = Runtime.getRuntime().exec("lsb_release -ds");
-                try (BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8))) {
-                    String line = Utils.strip(input.readLine());
-                    if (line != null && !line.isEmpty()) {
-                        line = line.replaceAll("\"+", "");
-                        line = line.replaceAll("NAME=", ""); // strange code for some Gentoo's
-                        if (line.startsWith("Linux ")) // e.g. Linux Mint
-                            return line;
-                        else if (!line.isEmpty())
-                            return "Linux " + line;
-                    }
+                String line = exec("lsb_release -ds");
+                if (line != null && !line.isEmpty()) {
+                    line = line.replaceAll("\"+", "");
+                    line = line.replaceAll("NAME=", ""); // strange code for some Gentoo's
+                    if (line.startsWith("Linux ")) // e.g. Linux Mint
+                        return line;
+                    else if (!line.isEmpty())
+                        return "Linux " + line;
                 }
             } catch (IOException e) {

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

@@ -27 +27 @@
 import static java.awt.event.KeyEvent.VK_Z;
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.WinRegistry.HKEY_LOCAL_MACHINE;
 
 import java.awt.GraphicsEnvironment;
@@ -36 +37 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.DirectoryStream;
@@ -64 +66 @@
 
 import javax.swing.JOptionPane;
+import javax.swing.UIManager;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.gui.preferences.display.LafPreference;
 import org.openstreetmap.josm.io.CertificateAmendment.CertAmend;
 
@@ -150 +154 @@
     private static final String WINDOWS_ROOT = "Windows-ROOT";
 
+    private static final String CURRENT_VERSION = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion";
+
+    private String oSBuildNumber;
+
     @Override
     public void afterPrefStartupHook() {
         extendFontconfig("fontconfig.properties.src");
+        // Workaround for JDK-8180379: crash on Windows 10 1703 with Windows L&F and java < 8u152 / 9+171
+        // To remove during Java 9 migration
+        if (System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("windows 10") &&
+                getDefaultStyle().equals(LafPreference.LAF.get())) {
+            try {
+                final int currentBuild = Integer.parseInt(getCurrentBuild());
+                final int javaVersion = Utils.getJavaVersion();
+                final int javaUpdate = Utils.getJavaUpdate();
+                final int javaBuild = Utils.getJavaBuild();
+                // See https://technet.microsoft.com/en-us/windows/release-info.aspx
+                if (currentBuild >= 15_063 && ((javaVersion == 8 && javaUpdate < 152)
+                        || (javaVersion == 9 && javaUpdate == 0 && javaBuild < 171))) {
+                    // Workaround from https://bugs.openjdk.java.net/browse/JDK-8179014
+                    UIManager.put("FileChooser.useSystemExtensionHiding", false);
+                }
+            } catch (NumberFormatException | ReflectiveOperationException e) {
+                Main.error(e);
+            }
+        }
     }
 
@@ -250 +277 @@
     }
 
+    private static String getProductName() throws IllegalAccessException, InvocationTargetException {
+        return WinRegistry.readString(HKEY_LOCAL_MACHINE, CURRENT_VERSION, "ProductName");
+    }
+
+    private static String getReleaseId() throws IllegalAccessException, InvocationTargetException {
+        return WinRegistry.readString(HKEY_LOCAL_MACHINE, CURRENT_VERSION, "ReleaseId");
+    }
+
+    private static String getCurrentBuild() throws IllegalAccessException, InvocationTargetException {
+        return WinRegistry.readString(HKEY_LOCAL_MACHINE, CURRENT_VERSION, "CurrentBuild");
+    }
+
+    private static String buildOSBuildNumber() {
+        StringBuilder sb = new StringBuilder();
+        try {
+            sb.append(getProductName()).append(' ')
+              .append(getReleaseId()).append(" (")
+              .append(getCurrentBuild()).append(')');
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            Main.error(e);
+        }
+        return sb.toString();
+    }
+
+    @Override
+    public String getOSBuildNumber() {
+        if (oSBuildNumber == null) {
+            oSBuildNumber = buildOSBuildNumber();
+        }
+        return oSBuildNumber;
+    }
+
     /**
      * Loads Windows-ROOT keystore.

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

@@ -1607 +1607 @@
                 dotPos > -1 ? dotPos : dashPos > -1 ? dashPos : 1));
     }
+
+    /**
+     * Returns the Java update as an int value.
+     * @return the Java update as an int value (121, 131, etc.)
+     * @since 12217
+     */
+    public static int getJavaUpdate() {
+        String version = System.getProperty("java.version");
+        if (version.startsWith("1.")) {
+            version = version.substring(2);
+        }
+        // Allow these formats:
+        // 1.8.0_72-ea
+        // 9-ea
+        // 9
+        // 9.0.1
+        int undePos = version.indexOf('_');
+        int dashPos = version.indexOf('-');
+        if (undePos > -1) {
+            return Integer.parseInt(version.substring(undePos + 1,
+                    dashPos > -1 ? dashPos : version.length()));
+        }
+        int firstDotPos = version.indexOf('.');
+        int lastDotPos = version.lastIndexOf('.');
+        return firstDotPos > - 1 ? Integer.parseInt(version.substring(firstDotPos + 1,
+                lastDotPos > -1 ? lastDotPos : version.length())) : 0;
+    }
+
+    /**
+     * Returns the Java build number as an int value.
+     * @return the Java build number as an int value (0, 1, etc.)
+     * @since 12217
+     */
+    public static int getJavaBuild() {
+        String version = System.getProperty("java.runtime.version");
+        int bPos = version.indexOf('b');
+        int pPos = version.indexOf('+');
+        return Integer.parseInt(version.substring(bPos > -1 ? bPos + 1 : pPos + 1, version.length()));
+    }
 }

trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java

@@ -219 +219 @@
 
     /**
+     * Test {@link Utils#getJavaUpdate}
+     */
+    @Test
+    public void testGetJavaUpdate() {
+        String javaVersion = System.getProperty("java.version");
+        try {
+            System.setProperty("java.version", "1.8.0_131");
+            assertEquals(131, Utils.getJavaUpdate());
+
+            System.setProperty("java.version", "1.8.0_152-ea");
+            assertEquals(152, Utils.getJavaUpdate());
+
+            System.setProperty("java.version", "9-ea");
+            assertEquals(0, Utils.getJavaUpdate());
+
+            System.setProperty("java.version", "9");
+            assertEquals(0, Utils.getJavaUpdate());
+
+            System.setProperty("java.version", "9.1.2");
+            assertEquals(1, Utils.getJavaUpdate());
+        } finally {
+            System.setProperty("java.version", javaVersion);
+        }
+    }
+
+    /**
+     * Test {@link Utils#getJavaBuild}
+     */
+    @Test
+    public void testGetJavaBuild() {
+        String javaVersion = System.getProperty("java.runtime.version");
+        try {
+            System.setProperty("java.runtime.version", "1.8.0_131-b11");
+            assertEquals(11, Utils.getJavaBuild());
+
+            System.setProperty("java.runtime.version", "1.8.0_152-ea-b04");
+            assertEquals(4, Utils.getJavaBuild());
+
+            System.setProperty("java.runtime.version", "9-ea+170");
+            assertEquals(170, Utils.getJavaBuild());
+
+            System.setProperty("java.runtime.version", "9+200");
+            assertEquals(200, Utils.getJavaBuild());
+
+            System.setProperty("java.runtime.version", "9.1.2+62");
+            assertEquals(62, Utils.getJavaBuild());
+        } finally {
+            System.setProperty("java.runtime.version", javaVersion);
+        }
+    }
+
+    /**
      * Tests if readBytesFromStream handles null streams (might happen when there is no data on error stream)
      * @throws IOException in case of I/O error