Changeset 9199 in josm

Timestamp:

2015-12-28T15:21:30+01:00 (9 years ago)

Author:

Don-vip

Message:

see #11924 - add compatibility with new Java 9 version scheme (MAJOR.MINOR.SECURITY, see JEP 223)

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (1 diff)
• data/projection/ProjectionRegressionTest.java (modified) (1 diff)

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

@@ -109 +109 @@
 
     /**
-     * Returns the Java version as a double value.
-     * @return the Java version as a double value (1.7, 1.8, 1.9, etc.)
+     * Returns the Java version as an int value.
+     * @return the Java version as an int value (7, 8, 9, etc.)
      */
-    public static double getJavaVersion() {
+    public static int getJavaVersion() {
         String version = System.getProperty("java.version");
-        int pos = version.indexOf('.');
-        pos = version.indexOf('.', pos + 1);
-        return Double.parseDouble(version.substring(0, pos));
+        if (version.startsWith("1.")) {
+            version = version.substring(2);
+        }
+        return Integer.parseInt(version.substring(0, version.indexOf('.')));
     }
 }

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

@@ -54 +54 @@
 
     private static String getProjectionDataFile() {
-        return TestUtils.getJavaVersion() >= 1.9 ? PROJECTION_DATA_FILE_JAVA_9 : PROJECTION_DATA_FILE;
+        return TestUtils.getJavaVersion() >= 9 ? PROJECTION_DATA_FILE_JAVA_9 : PROJECTION_DATA_FILE;
     }