Open external heap dump in full view similar to .nps snapshots.

Author: jisedlac

visualvm/heapdump/manifest.mf

@@ -5,5 +5,5 @@ OpenIDE-Module: com.sun.tools.visualvm.heapdump/0
 OpenIDE-Module-Install: com/sun/tools/visualvm/heapdump/Installer.class
 OpenIDE-Module-Layer: com/sun/tools/visualvm/heapdump/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: com/sun/tools/visualvm/heapdump/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
 

visualvm/heapdump/nbproject/project.xml

@@ -101,6 +101,22 @@
                         <specification-version>7.13.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.filesystems</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>9.11</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.loaders</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>7.67</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.openide.modules</code-name-base>
                     <build-prerequisite/>
@@ -109,6 +125,14 @@
                         <specification-version>7.3.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.nodes</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>7.46</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.openide.util</code-name-base>
                     <build-prerequisite/>
@@ -117,6 +141,14 @@
                         <specification-version>8.6.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util.lookup</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.34</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.openide.util.ui</code-name-base>
                     <build-prerequisite/>

visualvm/heapdump/src/com/sun/tools/visualvm/heapdump/impl/Bundle.properties

@@ -45,6 +45,10 @@ LBL_Loading_Heap_Dump=Loading Heap Dump...
 
 LBL_Loading_Heap_Dump_failed=Loading Heap Dump failed.
 
+MSG_Opening_Heap_Dump=Opening Heap Dump...
+
+MSG_Opening_Heap_Dump_failed=Opening heap dump failed.
+
 CAPTION_Remote_heap_dump=Remote Heap Dump
 
 MSG_Remote_heap_dump=&Heap dump file to be created on the remote system\:

visualvm/heapdump/src/com/sun/tools/visualvm/heapdump/impl/HeapDumpCategory.java

@@ -26,21 +26,34 @@
 package com.sun.tools.visualvm.heapdump.impl;
 
 import com.sun.tools.visualvm.core.snapshot.SnapshotCategory;
-import com.sun.tools.visualvm.core.ui.DataSourceWindowManager;
 import com.sun.tools.visualvm.heapdump.HeapDump;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.swing.SwingUtilities;
 import javax.swing.filechooser.FileFilter;
+import org.netbeans.api.actions.Openable;
+import org.netbeans.api.progress.ProgressHandle;
+import org.netbeans.api.progress.ProgressHandleFactory;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+import org.openide.loaders.DataObject;
 import org.openide.util.NbBundle;
+import org.openide.util.RequestProcessor;
 
 /**
  *
  * @author Jiri Sedlacek
  * @author Tomas Hurka
  */
 public class HeapDumpCategory extends SnapshotCategory<HeapDump> {
+    
+    private static final Logger LOGGER =
+            Logger.getLogger(HeapDumpCategory.class.getName());
+    
     private static final String HPROF_HEADER = "JAVA PROFILE 1.0";
     private static final long MIN_HPROF_SIZE = 1024*1024L;
     private static final String NAME = NbBundle.getMessage(HeapDumpCategory.class, "LBL_Heap_Dumps");   // NOI18N
@@ -56,7 +69,39 @@ public boolean supportsOpenSnapshot() {
     }
 
     public void openSnapshot(File file) {
-        DataSourceWindowManager.sharedInstance().openDataSource(new HeapDumpImpl(file, null));
+        RequestProcessor.getDefault().post(new Runnable() {
+            public void run() {
+                ProgressHandle pHandle = null;
+                try {
+                    pHandle = ProgressHandleFactory.createHandle(
+                            NbBundle.getMessage(HeapDumpCategory.class,
+                                                "MSG_Opening_Heap_Dump")); // NOI18N
+                    pHandle.setInitialDelay(0);
+                    pHandle.start();
+                    try {
+                        FileObject fileObject = FileUtil.toFileObject(file);
+                        DataObject dobj = DataObject.find(fileObject);
+                        Openable openCookie = dobj.getLookup().lookup(Openable.class);
+                        openCookie.open();
+                    } catch (Exception e) {
+                        LOGGER.log(Level.INFO, "Error loading profiler snapshot", e); // NOI18N
+                        // TODO: enable once HeapDump module is a friend of Profiler API
+//                        SwingUtilities.invokeLater(new Runnable() {
+//                            public void run() {
+//                                ProfilerDialogs.displayError(
+//                                        NbBundle.getMessage(HeapDumpCategory.class,
+//                                                            "MSG_Opening_Heap_Dump_failed")); // NOI18N
+//                            }   
+//                        });
+                    }
+                } finally {
+                    final ProgressHandle pHandleF = pHandle;
+                    SwingUtilities.invokeLater(new Runnable() {
+                        public void run() { if (pHandleF != null) pHandleF.finish(); }
+                    });
+                }
+            }
+        });
     }
 
     protected boolean isSnapshot(File file) {