Changeset 9202 in josm for trunk

Timestamp:

2015-12-28T17:36:08+01:00 (9 years ago)

Author:

Don-vip

Message:

see #11924 - add robustness for short versions "9" and "9-ea"

File:

• trunk/test/unit/org/openstreetmap/josm/TestUtils.java (modified) (1 diff)

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

@@ -117 +117 @@
             version = version.substring(2);
         }
-        return Integer.parseInt(version.substring(0, version.indexOf('.')));
+        // Allow these formats:
+        // 1.7.0_91
+        // 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));
     }
 }