Changeset 12130 in josm

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/Preferences.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/TestUtils.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/UtilsTest.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));
+    }
 }

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -154 +154 @@
 
     /**
-     * Returns the Java version as an int value.
-     * @return the Java version as an int value (8, 9, etc.)
-     */
-    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));
-    }
-
-    /**
      * Returns a private field value.
      * @param obj object

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java

@@ -25 +25 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -180 +180 @@
         }
 
-        final boolean java9 = TestUtils.getJavaVersion() >= 9;
+        final boolean java9 = Utils.getJavaVersion() >= 9;
         for (TestData data : allData) {
             Projection proj = Projections.getProjectionByCode(data.code);

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

@@ -196 +196 @@
 
     /**
+     * Test {@link Utils#getJavaVersion}
+     */
+    @Test
+    public void testGetJavaVersion() {
+        String javaVersion = System.getProperty("java.version");
+        try {
+            System.setProperty("java.version", "1.8.0_72-ea");
+            assertEquals(8, Utils.getJavaVersion());
+
+            System.setProperty("java.version", "9-ea");
+            assertEquals(9, Utils.getJavaVersion());
+
+            System.setProperty("java.version", "9");
+            assertEquals(9, Utils.getJavaVersion());
+
+            System.setProperty("java.version", "9.0.1");
+            assertEquals(9, Utils.getJavaVersion());
+        } finally {
+            System.setProperty("java.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