Merge branch 'master' into graal

Author: thurka

visualvm/heapdump/src/org/graalvm/visualvm/heapdump/HeapDump.java

@@ -29,6 +29,7 @@
 import org.graalvm.visualvm.core.snapshot.Snapshot;
 import org.graalvm.visualvm.core.snapshot.SnapshotsSupport;
 import java.io.File;
+import org.graalvm.visualvm.core.datasupport.Utils;
 import org.openide.util.NbBundle;
 
 /**
@@ -39,6 +40,8 @@
  */
 public abstract class HeapDump extends Snapshot {
 
+    private static final String HWCACHE_EXT = ".hwcache"; // NOI18N
+    
     /**
      * Creates new instance of HeapDump with the data stored in a file.
      * 
@@ -65,5 +68,19 @@ public boolean supportsSaveAs() {
     public void saveAs() {
         SnapshotsSupport.getInstance().saveAs(this, NbBundle.getMessage(HeapDump.class, "LBL_Save_Heap_Dump_As"));  // NOI18N
     }
+    
+    protected void remove() {
+        final File f = getFile();
+        
+        // #GH-111: delete the corresponding .hwcache directory
+        if (f != null) Utils.FILE_QUEUE.post(new Runnable() {
+            public void run() {
+                File ff = new File(f.getParent(), f.getName() + HWCACHE_EXT);
+                if (ff.isDirectory()) Utils.delete(ff, true);
+            }
+        });
+        
+        super.remove();
+    }
 
 }

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTreeTable.java

@@ -43,6 +43,7 @@
 
 package org.graalvm.visualvm.lib.ui.swing;
 
+import java.awt.AWTEvent;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -1567,6 +1568,37 @@ boolean isChangingModel() {
             return changingModel;
         }
 
+        
+        // --- Handle supported/unsupported AWT Events for the JTree -----------
+        
+        protected void processEvent(AWTEvent e) {
+            if (e instanceof KeyEvent) {
+                if (supportsKeyEvent((KeyEvent)e)) super.processEvent(e);
+            } else if (e instanceof MouseEvent) {
+                if (supportsMouseEvent((MouseEvent)e)) super.processEvent(e);
+            }
+        }
+        
+        private boolean supportsKeyEvent(KeyEvent e) {            
+            switch (e.getKeyCode()) {
+                // Bugfix #GH-109
+                // Handled by the table
+                case KeyEvent.VK_PAGE_UP:
+                case KeyEvent.VK_PAGE_DOWN:
+                    return false;
+                    
+                default:
+                    return true;
+            }
+        }
+        
+        private boolean supportsMouseEvent(MouseEvent e) {
+            return true;
+        }
+        
+        // ---------------------------------------------------------------------
+        
+        
         public String toString() {
             return getCellRenderer().toString();
         }

visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/JavaPlatform.java

@@ -163,25 +163,7 @@ public String getPlatformJDKVersion() {
             return null;
         }
 
-        if (ver.startsWith("1.5")) {
-            return CommonConstants.JDK_15_STRING; // NOI18N
-        } else if (ver.startsWith("1.6")) {
-            return CommonConstants.JDK_16_STRING; // NOI18N
-        } else if (ver.startsWith("1.7")) {
-            return CommonConstants.JDK_17_STRING; // NOI18N
-        } else if (ver.startsWith("1.8")) {
-            return CommonConstants.JDK_18_STRING; // NOI18N
-        } else if (ver.startsWith("1.9")) {
-            return CommonConstants.JDK_19_STRING; // NOI18N
-        } else if (ver.equals("9") || ver.startsWith("9.")) {
-            return CommonConstants.JDK_19_STRING; // NOI18N
-        } else if (ver.equals("10") || ver.startsWith("10.")) {
-            return CommonConstants.JDK_100_STRING; // NOI18N
-        } else if (ver.equals("11") || ver.startsWith("11.")) {
-            return CommonConstants.JDK_110_STRING; // NOI18N
-        } else {
-            return null;
-        }
+        return Platform.getJDKVersionString(ver);
     }
 
     /** Gets a path to java executable for specified platform. The platform passed cannot be null.

visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/Utils.java

@@ -218,7 +218,7 @@ protected void setupInstance(T instance) {}
 
         final T createInstance() {
             T instance = createInstanceImpl();
-            if (instance != null) setupInstance(instance);
+            if (instance != null) try { setupInstance(instance); } catch (Throwable t) {} // #GH-110: setting up the instance may fail at any time
             return instance;
         }