Changeset 9332 in josm for trunk/src/org

Timestamp:

2016-01-07T00:04:40+01:00 (8 years ago)

Author:

Don-vip

Message:

see #11924 - if available, use java.runtime.version instead of java.version in status report to get build number (useful for Early Access builds)

File:

• trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -70 +70 @@
     public static String getReportHeader() {
         StringBuilder text = new StringBuilder();
+        String runtimeVersion = System.getProperty("java.runtime.version");
         text.append(Version.getInstance().getReleaseAttributes())
             .append("\nIdentification: ").append(Version.getInstance().getAgentString())
@@ -79 +80 @@
             .append(Runtime.getRuntime().freeMemory()/1024/1024)
             .append(" MB allocated, but free)\nJava version: ")
-            .append(System.getProperty("java.version")).append(", ")
+            .append(runtimeVersion != null ? runtimeVersion : System.getProperty("java.version")).append(", ")
             .append(System.getProperty("java.vendor")).append(", ")
             .append(System.getProperty("java.vm.name")).append('\n');