JDK 10 support added

thurka · thurka · commit ead75b3fb355 · 2018-04-10T13:14:30.000+02:00
diff --git a/visualvm/application/manifest.mf b/visualvm/application/manifest.mf
@@ -5,5 +5,5 @@ OpenIDE-Module: com.sun.tools.visualvm.application/0
 OpenIDE-Module-Layer: com/sun/tools/visualvm/application/resources/layer.xml
 OpenIDE-Module-Install: com/sun/tools/visualvm/application/Installer.class
 OpenIDE-Module-Localizing-Bundle: com/sun/tools/visualvm/application/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.9
+OpenIDE-Module-Specification-Version: 1.10
 
diff --git a/visualvm/application/src/com/sun/tools/visualvm/application/jvm/DefaultJvm.java b/visualvm/application/src/com/sun/tools/visualvm/application/jvm/DefaultJvm.java
@@ -64,6 +64,10 @@ public boolean is19() {
         return false;
     }
     
+    public boolean is100() {
+        return false;
+    }
+
     public boolean isAttachable() {
         return false;
     }
diff --git a/visualvm/application/src/com/sun/tools/visualvm/application/jvm/Jvm.java b/visualvm/application/src/com/sun/tools/visualvm/application/jvm/Jvm.java
@@ -96,6 +96,17 @@ public boolean is19() {
         return false;
     }
 
+    /**
+     * Tests if target JVM is JRE 10.
+     * @return <CODE>true</CODE> if JVM is JRE 10, <CODE>false</CODE> otherwise
+     *
+     * @since VisualVM 1.4.1
+     */
+    public boolean is100() {
+        // default implementation for backward compatibility
+        return false;
+    }
+
     /**
      * Tests if VisualVM can attach to target JVM via
      * <a href=http://download.oracle.com/javase/6/docs/technotes/guides/attach/index.html>Attach API</a>.
diff --git a/visualvm/jvm/nbproject/genfiles.properties b/visualvm/jvm/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=ff5c27c4
+build.xml.data.CRC32=84e0b446
 build.xml.script.CRC32=25884fdd
 build.xml.stylesheet.CRC32=a56c6a5b@2.73
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=ff5c27c4
+nbproject/build-impl.xml.data.CRC32=84e0b446
 nbproject/build-impl.xml.script.CRC32=63c7509b
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.73
diff --git a/visualvm/jvm/nbproject/project.xml b/visualvm/jvm/nbproject/project.xml
@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>0</release-version>
-                        <specification-version>1.9</specification-version>
+                        <specification-version>1.10</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/jvm/src/com/sun/tools/visualvm/jvm/JVMImpl.java b/visualvm/jvm/src/com/sun/tools/visualvm/jvm/JVMImpl.java
@@ -221,6 +221,14 @@ public boolean is19() {
         return false;
     }
     
+    public boolean is100() {
+        String ver = getJavaVersion();
+        if (ver != null && (ver.startsWith("10"))) {    // NOI18N
+            return true;
+        }
+        return false;
+    }
+
     public boolean isDumpOnOOMEnabled() {
         if (isDumpOnOOMEnabled == null) {
             AttachModel attach = getAttach();
diff --git a/visualvm/jvmstat/src/com/sun/tools/visualvm/jvmstat/JvmJvmstatModelProvider.java b/visualvm/jvmstat/src/com/sun/tools/visualvm/jvmstat/JvmJvmstatModelProvider.java
@@ -80,6 +80,8 @@ public JvmJvmstatModel createModelFor(Application app) {
                     else if (javaVersion.startsWith("1.9.")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
                     // JVM 9
                     else if (javaVersion.startsWith("9")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
+                    // JVM 10
+                    else if (javaVersion.startsWith("10")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
                 }
                 if (model == null) { // still not recognized, fallback to  JvmJvmstatModel_5
                     LOGGER.log(Level.WARNING, "Unrecognized java.vm.version " + vmVersion); // NOI18N
diff --git a/visualvm/launcher/visualvm b/visualvm/launcher/visualvm
@@ -211,6 +211,7 @@ case "`uname`" in
             '"-J-Xdock:icon=$basedir/etc/visualvm.icns"' \
             --branding visualvm \
             --clusters '"$visualvm_clusters"' \
+            --laf com.apple.laf.AquaLookAndFeel \
             ${visualvm_default_options} \
             '"$@"'
         ;;
diff --git a/visualvm/profiler/nbproject/genfiles.properties b/visualvm/profiler/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=fee5938e
+build.xml.data.CRC32=476375e9
 build.xml.script.CRC32=03a7511e
 build.xml.stylesheet.CRC32=a56c6a5b@2.73
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=fee5938e
+nbproject/build-impl.xml.data.CRC32=476375e9
 nbproject/build-impl.xml.script.CRC32=6c1a4403
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.73
diff --git a/visualvm/profiler/nbproject/project.xml b/visualvm/profiler/nbproject/project.xml
@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>0</release-version>
-                        <specification-version>1.9</specification-version>
+                        <specification-version>1.10</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/profiler/src/com/sun/tools/visualvm/profiler/ProfilerSupport.java b/visualvm/profiler/src/com/sun/tools/visualvm/profiler/ProfilerSupport.java
@@ -73,12 +73,14 @@ public final class ProfilerSupport {
     private static final String AZUL_VM_VENDOR_PREFIX = "Azul ";  // NOI18N
     private static final String SAP_VM_VENDOR_PREFIX = "SAP AG";  // NOI18N
     private static final String GRAAL_VM_VENDOR_PREFIX = "GraalVM ";  // NOI18N
+    private static final String ORACLE1_VM_VENDOR_PREFIX = "\"Oracle ";  // NOI18N
     
     private static final String JAVA_RT_16_PREFIX = "1.6.0";  // NOI18N
     private static final String JAVA_RT_17_PREFIX = "1.7.0";  // NOI18N
     private static final String JAVA_RT_18_PREFIX = "1.8.0";  // NOI18N
     private static final String JAVA_RT_19_PREFIX = "1.9.0";  // NOI18N
     private static final String JAVA_RT_9_PREFIX = "9";  // NOI18N
+    private static final String JAVA_RT_100_PREFIX = "10";  // NOI18N
     
     private static ProfilerSupport instance;
     
@@ -128,6 +130,8 @@ public String[][] getSupportedJavaPlatforms() {
             String code = "jdk1" + (5 + i); // NOI18N
             if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) codesl.add(code);
         }
+        String code = "jdk100"; // NOI18N
+        if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) codesl.add(code);
         
         String[] names = new String[codesl.size()];
         String[] codes = new String[codesl.size()];
@@ -170,6 +174,8 @@ static String getJavaName(String code) {
             return NbBundle.getMessage(ProfilerSupport.class, "STR_Java_platform_name", 8); // NOI18N
         if (Platform.JDK_19_STRING.equals(code))
             return NbBundle.getMessage(ProfilerSupport.class, "STR_Java_platform_name", 9); // NOI18N
+        if (Platform.JDK_100_STRING.equals(code))
+            return NbBundle.getMessage(ProfilerSupport.class, "STR_Java_platform_name", 10); // NOI18N
         throw new IllegalArgumentException("Unknown java code " + code); // NOI18N
     }
     
@@ -307,7 +313,9 @@ boolean supportsProfiling(Application application) {
 //////        return false;
 
         // Profiled application needs to be running JDK 6.0 or 7.0 or 8.0 or 9.0
-        if (!jvm.is16() && !jvm.is17() && !jvm.is18() && !jvm.is19()) return false;
+        // or 10
+        if (!jvm.is16() && !jvm.is17() && !jvm.is18()
+             && !jvm.is19() && !jvm.is100()) return false;
         
         String vmName = jvm.getVmName();
         String vmVendor = jvm.getVmVendor();
@@ -319,7 +327,8 @@ boolean supportsProfiling(Application application) {
                                || vmName.startsWith(SAPJDK_VM_NAME_PREFIX) || vmName.startsWith(GRAAL_VM_VENDOR_PREFIX)) &&
                vmVendor != null && (vmVendor.startsWith(ORACLE_VM_VENDOR_PREFIX) || vmVendor.startsWith(SUN_VM_VENDOR_PREFIX)
                                  || vmVendor.startsWith(APPLE_VM_VENDOR_PREFIX) || vmVendor.startsWith(HP_VM_VENDOR_PREFIX)
-                                 || vmVendor.startsWith(AZUL_VM_VENDOR_PREFIX) || vmVendor.startsWith(SAP_VM_VENDOR_PREFIX));
+                                 || vmVendor.startsWith(AZUL_VM_VENDOR_PREFIX) || vmVendor.startsWith(SAP_VM_VENDOR_PREFIX)
+                                 || vmVendor.startsWith(ORACLE1_VM_VENDOR_PREFIX));
     }
     
     static boolean classSharingBreaksProfiling(Application application) {
@@ -360,6 +369,8 @@ static boolean classSharingBreaksProfiling(Application application) {
                 return false;
             } else if (javaRTVersion.startsWith(JAVA_RT_9_PREFIX)) {
                 return false;
+            } else if (javaRTVersion.startsWith(JAVA_RT_100_PREFIX)) {
+                return false;
             }
         // OpenJDK -------------------------------------------------------------
         } else if(vmName.startsWith(OPENJDK_VM_NAME_PREFIX)) {
@@ -385,6 +396,8 @@ else if (javaRTVersion.startsWith(JAVA_RT_18_PREFIX)) {
                 return false;
             } else if (javaRTVersion.startsWith(JAVA_RT_9_PREFIX)) {
                 return false;
+            } else if (javaRTVersion.startsWith(JAVA_RT_100_PREFIX)) {
+                return false;
             }
         }
         
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 or JDK 9 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 or JDK 9 or JDK 10 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
@@ -61,8 +61,8 @@ static synchronized boolean checkEnv() {
         if (DISABLE_STARTUP_CHECK) {
             System.err.println("Starting with com.sun.tools.visualvm.modules.startup.DisableStartupCheck=true"); // NOI18N
         } else {
-            if (!isJava8or9()) {
-                displayError8or9();
+            if (!isJava8or9or10()) {
+                displayError8or9or10();
                 return false;
             } else if (!isJDK()) {
                 displayErrorJRE();
@@ -73,7 +73,7 @@ static synchronized boolean checkEnv() {
         return true;
     }
     
-    private static void displayError8or9() {
+    private static void displayError8or9or10() {
         Utils.setSystemLaF();
         JDialog d = StartupDialog.create(ERROR_STARTUP_CAPTION, MessageFormat.format(INCORRECT_VERSION_MSG,
                 new Object[] { System.getProperty("java.specification.version"), getJavaInfo(), // NOI18N
@@ -90,11 +90,12 @@ private static void displayErrorJRE() {
         d.setVisible(true);
     }
     
-    private static boolean isJava8or9() {
+    private static boolean isJava8or9or10() {
         String javaVersion = System.getProperty("java.specification.version"); // NOI18N
         if (javaVersion == null) return false;
         return javaVersion.startsWith("1.8")  // NOI18N
-            || javaVersion.startsWith("1.9") || javaVersion.startsWith("9"); // NOI18N
+            || javaVersion.startsWith("1.9") || javaVersion.startsWith("9") // NOI18N
+            || javaVersion.startsWith("10"); // NOI18N
     }
     
     private static boolean isJDK() {

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,10 @@ public boolean is19() {`
`64`	`64`	`return false;`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ public boolean is100() {`
	`68`	`+ return false;`
	`69`	`+ }`
	`70`	`+`
`67`	`71`	`public boolean isAttachable() {`
`68`	`72`	`return false;`
`69`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,8 @@ public JvmJvmstatModel createModelFor(Application app) {`
`80`	`80`	`else if (javaVersion.startsWith("1.9.")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N`
`81`	`81`	`// JVM 9`
`82`	`82`	`else if (javaVersion.startsWith("9")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N`
	`83`	`+ // JVM 10`
	`84`	`+ else if (javaVersion.startsWith("10")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N`
`83`	`85`	`}`
`84`	`86`	`if (model == null) { // still not recognized, fallback to JvmJvmstatModel_5`
`85`	`87`	`LOGGER.log(Level.WARNING, "Unrecognized java.vm.version " + vmVersion); // NOI18N`