JDK 13 support added

thurka · thurka · commit 339cb9fc5800 · 2019-09-17T15:54:00.000+02:00
diff --git a/visualvm/jvmstat/src/com/sun/tools/visualvm/jvmstat/JvmJvmstatModelProvider.java b/visualvm/jvmstat/src/com/sun/tools/visualvm/jvmstat/JvmJvmstatModelProvider.java
@@ -66,6 +66,8 @@ public JvmJvmstatModel createModelFor(Application app) {
                 else if (isJavaVersion(javaVersion,"11")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
                 // JVM 12
                 else if (isJavaVersion(javaVersion,"12")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
+                // JVM 13
+                else if (isJavaVersion(javaVersion,"13")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
             }
             
             if (model == null) {
diff --git a/visualvm/profiler/src/com/sun/tools/visualvm/profiler/ProfilerSupport.java b/visualvm/profiler/src/com/sun/tools/visualvm/profiler/ProfilerSupport.java
@@ -111,6 +111,8 @@ public boolean hasSupportedJavaPlatforms() {
         if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) return true;
         code = "jdk120"; // NOI18N
         if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) return true;
+        code = "jdk130"; // NOI18N
+        if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) return true;
         return false;
     }
     
@@ -127,6 +129,8 @@ public String[][] getSupportedJavaPlatforms() {
         if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) codesl.add(code);
         code = "jdk120"; // NOI18N
         if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) codesl.add(code);
+        code = "jdk130"; // NOI18N
+        if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) codesl.add(code);
         
         String[] names = new String[codesl.size()];
         String[] codes = new String[codesl.size()];
@@ -175,6 +179,8 @@ static String getJavaName(String code) {
             return NbBundle.getMessage(ProfilerSupport.class, "STR_Java_platform_name", 11); // NOI18N
         if (Platform.JDK_120_STRING.equals(code))
             return NbBundle.getMessage(ProfilerSupport.class, "STR_Java_platform_name", 12); // NOI18N
+        if (Platform.JDK_130_STRING.equals(code))
+            return NbBundle.getMessage(ProfilerSupport.class, "STR_Java_platform_name", 13); // NOI18N
         throw new IllegalArgumentException("Unknown java code " + code); // NOI18N
     }
     
diff --git a/visualvm/startup/src/com/sun/tools/visualvm/modules/startup/Bundle.properties b/visualvm/startup/src/com/sun/tools/visualvm/modules/startup/Bundle.properties
@@ -53,5 +53,5 @@ ACSD_RejectButton=Click to reject license and exit
 OpenIDE-Module-Short-Description=VisualVM startup Module
 
 VisualVMStartup_ErrorStartupCaption=Error Starting VisualVM
-VisualVMStartup_IncorrectVersionMsg=<html><br><b>You are running VisualVM using an unsupported Java version: {0}.</b><br><br>Please use JDK 8 to JDK 12 to run VisualVM. For information<br>about requirements and setup visit https://visualvm.github.io.<br><br><hr><i>Java: {1}<br>JVM: {2}<br>Location: {3}</i><br><br></html>
+VisualVMStartup_IncorrectVersionMsg=<html><br><b>You are running VisualVM using an unsupported Java version: {0}.</b><br><br>Please use JDK 8 to JDK 13 to run VisualVM. For information<br>about requirements and setup visit https://visualvm.github.io.<br><br><hr><i>Java: {1}<br>JVM: {2}<br>Location: {3}</i><br><br></html>
 VisualVMStartup_JreMsg=<html><br><b>You are running VisualVM using Java Runtime Environment (JRE).</b><br><br>Please use Java Development Kit (JDK) to run VisualVM. For information<br>about requirements and setup visit https://visualvm.github.io.<br><br><hr><i>Java: {0}<br>JVM: {1}<br>Location: {2}</i><br><br></html>
diff --git a/visualvm/startup/src/com/sun/tools/visualvm/modules/startup/VisualVMStartup.java b/visualvm/startup/src/com/sun/tools/visualvm/modules/startup/VisualVMStartup.java
@@ -97,7 +97,8 @@ private static boolean isSupportedJava() {
             || javaVersion.startsWith("1.9") || javaVersion.startsWith("9") // NOI18N
             || javaVersion.startsWith("10") // NOI18N
             || javaVersion.startsWith("11") // NOI18N
-            || javaVersion.startsWith("12"); // NOI18N
+            || javaVersion.startsWith("12") // NOI18N
+            || javaVersion.startsWith("13"); // NOI18N
     }
     
     private static boolean isJDK() {

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,8 @@ public JvmJvmstatModel createModelFor(Application app) {`
`66`	`66`	`else if (isJavaVersion(javaVersion,"11")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N`
`67`	`67`	`// JVM 12`
`68`	`68`	`else if (isJavaVersion(javaVersion,"12")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N`
	`69`	`+ // JVM 13`
	`70`	`+ else if (isJavaVersion(javaVersion,"13")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`if (model == null) {`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,8 @@ private static boolean isSupportedJava() {`
`97`	`97`	`\|\| javaVersion.startsWith("1.9") \|\| javaVersion.startsWith("9") // NOI18N`
`98`	`98`	`\|\| javaVersion.startsWith("10") // NOI18N`
`99`	`99`	`\|\| javaVersion.startsWith("11") // NOI18N`
`100`		`- \|\| javaVersion.startsWith("12"); // NOI18N`
	`100`	`+ \|\| javaVersion.startsWith("12") // NOI18N`
	`101`	`+ \|\| javaVersion.startsWith("13"); // NOI18N`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`private static boolean isJDK() {`