Changeset 13520 in josm

Timestamp:

2018-03-12T22:32:42+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15560 - fix detection of Java version >= 10

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/Utils.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/UtilsTest.java (modified) (1 diff)

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

@@ -1575 +1575 @@
     /**
      * Returns the Java version as an int value.
-     * @return the Java version as an int value (8, 9, etc.)
+     * @return the Java version as an int value (8, 9, 10, etc.)
      * @since 12130
      */
@@ -1591 +1591 @@
         int dashPos = version.indexOf('-');
         return Integer.parseInt(version.substring(0,
-                dotPos > -1 ? dotPos : dashPos > -1 ? dashPos : 1));
+                dotPos > -1 ? dotPos : dashPos > -1 ? dashPos : version.length()));
     }
 

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

@@ -213 +213 @@
             System.setProperty("java.version", "9.0.1");
             assertEquals(9, Utils.getJavaVersion());
+
+            System.setProperty("java.version", "10");
+            assertEquals(10, Utils.getJavaVersion());
+
+            System.setProperty("java.version", "10-ea");
+            assertEquals(10, Utils.getJavaVersion());
+
+            System.setProperty("java.version", "10.0.1");
+            assertEquals(10, Utils.getJavaVersion());
         } finally {
             System.setProperty("java.version", javaVersion);