Mercurial > hg > release > icedtea-web-1.7

changeset 1484:cd94fb214752

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added semi support for recognition jdk10 and up * netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java: replaced hardcoded 9 by cycle from 9 to 99 * netx/net/sourceforge/jnlp/resources/Messages.properties: replaced jdk9 by jdk9 and up.
author Jiri Vanek <jvanek@redhat.com>
date Mon, 10 Sep 2018 17:36:21 +0200
parents 96c91c6c1bb3
children f136f53d661c
files ChangeLog netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java netx/net/sourceforge/jnlp/resources/Messages.properties
diffstat 3 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Sep 10 17:35:31 2018 +0200
+++ b/ChangeLog	Mon Sep 10 17:36:21 2018 +0200
@@ -1,3 +1,9 @@
+2018-06-20  Jiri Vanek <jvanek@redhat.com>
+
+	Added semi support for recognition jdk10 and up
+	* netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java: replaced hardcoded 9 by cycle from 9 to 99
+	* netx/net/sourceforge/jnlp/resources/Messages.properties: replaced jdk9 by jdk9 and up.
+
 2018-05-28  Jiri Vanek <jvanek@redhat.com>
 
 	added deployment property to enforce headfull execution
--- a/netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java	Mon Sep 10 17:35:31 2018 +0200
+++ b/netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java	Mon Sep 10 17:36:21 2018 +0200
@@ -281,8 +281,13 @@
         }
 
         boolean findRT = false;
-
-        if (processErrorStream.contains("\"9") || processStdOutStream.contains("\"9") || processErrorStream.contains("build 9") || processStdOutStream.contains("build 9")) {
+        boolean jdk9up = false;
+        for (int i = 9; i <= 99; i++) {
+            if (processErrorStream.contains("\"" + i) || processStdOutStream.contains("\"" + i)) {
+                jdk9up = true;
+            }
+        }
+        if (jdk9up) {
             validationResult += "<span color=\"green\">" + Translator.R("CPJVMjdk9") + "</span><br />";
             findRT = false;
         } else if (processErrorStream.contains("1.8.0") || processStdOutStream.contains("1.8.0")) {
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Mon Sep 10 17:35:31 2018 +0200
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Mon Sep 10 17:36:21 2018 +0200
@@ -612,7 +612,7 @@
 CPJVMjdk6=JDK6 recognized. JDK7 and older are longer supported.
 CPJVMjdk7=JDK7 recognized. JDK7 and older are longer supported.
 CPJVMjdk8=JDK8 recognized. Jdk8 and higher are supported
-CPJVMjdk9=JDK9 recognized. Jdk8 and higher are supported
+CPJVMjdk9=JDK9 or higher recognized. Jdk8 and higher are supported. Jdk9 and up can have modularity issues.
 CPJVMjdk=Unknown version. Hard to judge support. See tooltip or console/standard output (depends on verbosity)for real version.
 CPJVMoracleFound=Great, Oracle java detected
 CPJVMibmFound=Good, IBM java detected