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

Timestamp:

2017-05-13T00:56:58+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11924 - do not try old workaround with java 9 (pollutes console with stacktrace)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (2 diffs)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1405 +1405 @@
     /**
      * Updates system properties with the current values in the preferences.
-     *
      */
     public void updateSystemProperties() {
@@ -1417 +1416 @@
         // Force AWT toolkit to update its internal preferences (fix #6345).
         // Does not work anymore with Java 9, to remove with Java 9 migration
-        if (!GraphicsEnvironment.isHeadless()) {
+        if (Utils.getJavaVersion() < 9 && !GraphicsEnvironment.isHeadless()) {
             try {
                 Field field = Toolkit.class.getDeclaredField("resources");

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

@@ -1586 +1586 @@
         return angleDeg * TO_RADIANS;
     }
+
+    /**
+     * Returns the Java version as an int value.
+     * @return the Java version as an int value (8, 9, etc.)
+     * @since 12130
+     */
+    public static int getJavaVersion() {
+        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 dotPos = version.indexOf('.');
+        int dashPos = version.indexOf('-');
+        return Integer.parseInt(version.substring(0,
+                dotPos > -1 ? dotPos : dashPos > -1 ? dashPos : 1));
+    }
 }