Snapshot file can become null in some special cases (snapshot deleted during opening)

jisedlac · thurka · commit b9bbe20d93bb · 2017-11-21T09:46:01.000+01:00
- handle it for snapshot node
 - handle it for Save As action
 - handle it for snapshot viewer
diff --git a/visualvm/application/src/com/sun/tools/visualvm/application/snapshot/ApplicationSnapshot.java b/visualvm/application/src/com/sun/tools/visualvm/application/snapshot/ApplicationSnapshot.java
@@ -66,7 +66,7 @@ public void save(File directory) {
     }
     
     public boolean supportsSaveAs() {
-        return true;
+        return getFile() != null;
     }
 
     public void saveAs() {
diff --git a/visualvm/core/src/com/sun/tools/visualvm/core/snapshot/Bundle.properties b/visualvm/core/src/com/sun/tools/visualvm/core/snapshot/Bundle.properties
@@ -25,6 +25,7 @@
 LBL_Snapshots=Snapshots
 
 LBL_Saving=Saving {0}...
+LBL_CannotSave=Snapshot cannot be saved.
 
 LBL_SourceProperties=Source
 DESCR_SourceProperties=File or directory of the snapshot
diff --git a/visualvm/core/src/com/sun/tools/visualvm/core/snapshot/SnapshotDescriptor.java b/visualvm/core/src/com/sun/tools/visualvm/core/snapshot/SnapshotDescriptor.java
@@ -28,6 +28,7 @@
 import com.sun.tools.visualvm.core.datasource.descriptor.DataSourceDescriptor;
 import java.awt.Image;
 import java.io.File;
+import org.openide.util.NbBundle;
 
 /**
  * Abstract implementation of DataSourceDescriptor for snapshots.
@@ -92,13 +93,12 @@ protected static String resolveSnapshotName(Snapshot snapshot) {
         if (persistedName != null) return persistedName;
         
         File file = snapshot.getFile();
-        if (file == null) return snapshot.toString();
-        
-        String fileName = file.getName();
+        String fileName = file != null ? file.getName() :
+               NbBundle.getMessage(SnapshotDescriptor.class, "LBL_NoFile");    // NOI18N
         SnapshotCategory category = snapshot.getCategory();
         String name = "[" + category.getPrefix() + "] " + fileName; // NOI18N
         
-        if (category.isSnapshot(file)) {
+        if (file != null && category.isSnapshot(file)) {
             String timeStamp = category.getTimeStamp(fileName);
             if (timeStamp != null) name = "[" + category.getPrefix() + "] " + timeStamp;    // NOI18N
         }
diff --git a/visualvm/core/src/com/sun/tools/visualvm/core/snapshot/SnapshotsSupport.java b/visualvm/core/src/com/sun/tools/visualvm/core/snapshot/SnapshotsSupport.java
@@ -35,6 +35,7 @@
 import javax.swing.SwingUtilities;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
+import org.netbeans.modules.profiler.api.ProfilerDialogs;
 import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
 import org.openide.util.RequestProcessor;
@@ -71,33 +72,37 @@ public static synchronized SnapshotsSupport getInstance() {
      */
     public void saveAs(final Snapshot snapshot, String dialogTitle) {
         final File file = snapshot.getFile();
-        JFileChooser chooser = new JFileChooser();
-        chooser.setDialogTitle(dialogTitle);
-        chooser.setSelectedFile(new File(snapshot.getFile().getName()));
-        chooser.setAcceptAllFileFilterUsed(false);
-        chooser.setFileFilter(snapshot.getCategory().getFileFilter());
-//        chooser.setFileView(category.getFileView());
-        if (chooser.showSaveDialog(WindowManager.getDefault().getMainWindow()) == JFileChooser.APPROVE_OPTION) {
-            String categorySuffix = snapshot.getCategory().getSuffix();
-            String filePath = chooser.getSelectedFile().getAbsolutePath();
-            if (!filePath.endsWith(categorySuffix)) filePath += categorySuffix;
-            final File copy = new File(filePath);
-            RequestProcessor.getDefault().post(new Runnable() {
-                public void run() {
-                    ProgressHandle pHandle = null;
-                    try {
-                        pHandle = ProgressHandleFactory.createHandle(NbBundle.getMessage(SnapshotsSupport.class, "LBL_Saving",DataSourceDescriptorFactory.getDescriptor(snapshot).getName()));  // NOI18N
-                        pHandle.setInitialDelay(0);
-                        pHandle.start();
-                        Utils.copyFile(file, copy);
-                    } finally {
-                        final ProgressHandle pHandleF = pHandle;
-                        SwingUtilities.invokeLater(new Runnable() {
-                            public void run() { if (pHandleF != null) pHandleF.finish(); }
-                        });
+        if (file == null) {
+            ProfilerDialogs.displayError(NbBundle.getMessage(SnapshotsSupport.class, "LBL_CannotSave"));  // NOI18N
+        } else {
+            JFileChooser chooser = new JFileChooser();
+            chooser.setDialogTitle(dialogTitle);
+            chooser.setSelectedFile(new File(snapshot.getFile().getName()));
+            chooser.setAcceptAllFileFilterUsed(false);
+            chooser.setFileFilter(snapshot.getCategory().getFileFilter());
+    //        chooser.setFileView(category.getFileView());
+            if (chooser.showSaveDialog(WindowManager.getDefault().getMainWindow()) == JFileChooser.APPROVE_OPTION) {
+                String categorySuffix = snapshot.getCategory().getSuffix();
+                String filePath = chooser.getSelectedFile().getAbsolutePath();
+                if (!filePath.endsWith(categorySuffix)) filePath += categorySuffix;
+                final File copy = new File(filePath);
+                RequestProcessor.getDefault().post(new Runnable() {
+                    public void run() {
+                        ProgressHandle pHandle = null;
+                        try {
+                            pHandle = ProgressHandleFactory.createHandle(NbBundle.getMessage(SnapshotsSupport.class, "LBL_Saving",DataSourceDescriptorFactory.getDescriptor(snapshot).getName()));  // NOI18N
+                            pHandle.setInitialDelay(0);
+                            pHandle.start();
+                            Utils.copyFile(file, copy);
+                        } finally {
+                            final ProgressHandle pHandleF = pHandle;
+                            SwingUtilities.invokeLater(new Runnable() {
+                                public void run() { if (pHandleF != null) pHandleF.finish(); }
+                            });
+                        }
                     }
-                }
-            });
+                });
+            }
         }
     }
     
diff --git a/visualvm/coredump/src/com/sun/tools/visualvm/coredump/CoreDump.java b/visualvm/coredump/src/com/sun/tools/visualvm/coredump/CoreDump.java
@@ -105,7 +105,7 @@ public final String getJDKHome() {
     }
     
     public boolean supportsSaveAs() {
-        return true;
+        return getFile() != null;
     }
     
     public void saveAs() {
diff --git a/visualvm/heapdump/src/com/sun/tools/visualvm/heapdump/HeapDump.java b/visualvm/heapdump/src/com/sun/tools/visualvm/heapdump/HeapDump.java
@@ -59,7 +59,7 @@ public HeapDump(File file, DataSource master) {
     }
     
     public boolean supportsSaveAs() {
-        return true;
+        return getFile() != null;
     }
     
     public void saveAs() {
diff --git a/visualvm/heapdump/src/com/sun/tools/visualvm/heapdump/impl/Bundle.properties b/visualvm/heapdump/src/com/sun/tools/visualvm/heapdump/impl/Bundle.properties
@@ -43,6 +43,8 @@ LBL_Creating_Heap_Dump=Creating Heap Dump...
 
 LBL_Loading_Heap_Dump=Loading Heap Dump...
 
+LBL_Loading_Heap_Dump_failed=Loading Heap Dump failed.
+
 CAPTION_Remote_heap_dump=Remote Heap Dump
 
 MSG_Remote_heap_dump=&Heap dump file to be created on the remote system\:
diff --git a/visualvm/heapdump/src/com/sun/tools/visualvm/heapdump/impl/HeapDumpView.java b/visualvm/heapdump/src/com/sun/tools/visualvm/heapdump/impl/HeapDumpView.java
@@ -107,8 +107,9 @@ private static class MasterViewSupport extends JPanel  {
         private JPanel contentsPanel;
         
         public MasterViewSupport(HeapDump heapDump) {
-            initComponents();
-            loadHeap(heapDump.getFile());
+            File file = heapDump.getFile();
+            initComponents(file != null);
+            if (file != null) loadHeap(file);
         }
         
         
@@ -117,10 +118,12 @@ public DataViewComponent.MasterView getMasterView() {
         }
         
         
-        private void initComponents() {
+        private void initComponents(boolean hasDump) {
             setLayout(new BorderLayout());
             
-            progressLabel = new JLabel(NbBundle.getMessage(HeapDumpView.class, "LBL_Loading_Heap_Dump"), SwingConstants.CENTER);    // NOI18N
+            String label = hasDump ? NbBundle.getMessage(HeapDumpView.class, "LBL_Loading_Heap_Dump") :    // NOI18N
+                                     NbBundle.getMessage(HeapDumpView.class, "LBL_Loading_Heap_Dump_failed");    // NOI18N
+            progressLabel = new JLabel(label, SwingConstants.CENTER);
         
             contentsPanel = new JPanel(new BorderLayout());
             contentsPanel.add(progressLabel, BorderLayout.CENTER);
diff --git a/visualvm/profiling/src/com/sun/tools/visualvm/profiling/snapshot/ProfilerSnapshot.java b/visualvm/profiling/src/com/sun/tools/visualvm/profiling/snapshot/ProfilerSnapshot.java
@@ -67,7 +67,7 @@ public ProfilerSnapshot(File file, DataSource master) {
     
     @Override
     public boolean supportsSaveAs() {
-        return true;
+        return getFile() != null;
     }
     
     @Override
diff --git a/visualvm/threaddump/src/com/sun/tools/visualvm/threaddump/ThreadDump.java b/visualvm/threaddump/src/com/sun/tools/visualvm/threaddump/ThreadDump.java
@@ -59,7 +59,7 @@ public ThreadDump(File file, DataSource master) {
     }
     
     public boolean supportsSaveAs() {
-        return true;
+        return getFile() != null;
     }
     
     public void saveAs() {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public void save(File directory) {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public boolean supportsSaveAs() {`
`69`		`- return true;`
	`69`	`+ return getFile() != null;`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public void saveAs() {`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public final String getJDKHome() {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`public boolean supportsSaveAs() {`
`108`		`- return true;`
	`108`	`+ return getFile() != null;`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`public void saveAs() {`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public HeapDump(File file, DataSource master) {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public boolean supportsSaveAs() {`
`62`		`- return true;`
	`62`	`+ return getFile() != null;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public void saveAs() {`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public ProfilerSnapshot(File file, DataSource master) {`
`67`	`67`
`68`	`68`	`@Override`
`69`	`69`	`public boolean supportsSaveAs() {`
`70`		`- return true;`
	`70`	`+ return getFile() != null;`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public ThreadDump(File file, DataSource master) {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public boolean supportsSaveAs() {`
`62`		`- return true;`
	`62`	`+ return getFile() != null;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public void saveAs() {`