8324950: IGV: save the state to a file

src/utils/IdealGraphVisualizer/Coordinator/pom.xml

@@ -88,6 +88,11 @@
             <artifactId>org-openide-util-lookup</artifactId>
             <version>${netbeans.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-modules</artifactId>
+            <version>${netbeans.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-util-ui</artifactId>

src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/ImportAction.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,24 +25,10 @@
 package com.sun.hotspot.igv.coordinator.actions;
 
 import com.sun.hotspot.igv.coordinator.OutlineTopComponent;
-import com.sun.hotspot.igv.data.GraphDocument;
-import com.sun.hotspot.igv.data.serialization.GraphParser;
-import com.sun.hotspot.igv.data.serialization.ParseMonitor;
-import com.sun.hotspot.igv.data.serialization.Parser;
-import com.sun.hotspot.igv.settings.Settings;
-import java.io.File;
-import java.io.IOException;
-import java.nio.channels.FileChannel;
-import java.nio.file.StandardOpenOption;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.swing.Action;
-import javax.swing.JFileChooser;
-import javax.swing.SwingUtilities;
-import javax.swing.filechooser.FileFilter;
-import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
-import org.openide.util.*;
+import org.openide.util.HelpCtx;
+import org.openide.util.ImageUtilities;
+import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 
 /**
@@ -51,102 +37,22 @@
  */
 
 public final class ImportAction extends CallableSystemAction {
-    private static final int WORKUNITS = 10000;
 
-    public static FileFilter getFileFilter() {
-        return new FileFilter() {
-
-            @Override
-            public boolean accept(File f) {
-                return f.getName().toLowerCase().endsWith(".xml") || f.isDirectory();
-            }
-
-            @Override
-            public String getDescription() {
-                return "Graph files (*.xml)";
-            }
-        };
+    public ImportAction() {
+        putValue(Action.SHORT_DESCRIPTION, "Import from XML...");
+        putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon(iconResource(), true));
     }
 
     @Override
     public void performAction() {
-        JFileChooser fc = new JFileChooser();
-        fc.setFileFilter(ImportAction.getFileFilter());
-        fc.setCurrentDirectory(new File(Settings.get().get(Settings.DIRECTORY, Settings.DIRECTORY_DEFAULT)));
-        fc.setMultiSelectionEnabled(true);
-
-        if (fc.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
-            for (final File file : fc.getSelectedFiles()) {
-                File dir = file;
-                if (!dir.isDirectory()) {
-                    dir = dir.getParentFile();
-                }
-
-                Settings.get().put(Settings.DIRECTORY, dir.getAbsolutePath());
-                try {
-                    final FileChannel channel = FileChannel.open(file.toPath(), StandardOpenOption.READ);
-                    final ProgressHandle handle = ProgressHandleFactory.createHandle("Opening file " + file.getName());
-                    handle.start(WORKUNITS);
-                    final long startTime = System.currentTimeMillis();
-                    final long start = channel.size();
-                    ParseMonitor monitor = new ParseMonitor() {
-                            @Override
-                            public void updateProgress() {
-                                try {
-                                    int prog = (int) (WORKUNITS * (double) channel.position() / (double) start);
-                                    handle.progress(prog);
-                                } catch (IOException ignored) {}
-                            }
-                            @Override
-                            public void setState(String state) {
-                                updateProgress();
-                                handle.progress(state);
-                            }
-                        };
-                    final GraphParser parser;
-                    final OutlineTopComponent component = OutlineTopComponent.findInstance();
-                    if (file.getName().endsWith(".xml")) {
-                        parser = new Parser(channel, monitor, null);
-                    } else {
-                        parser = null;
-                    }
-                    RequestProcessor.getDefault().post(new Runnable() {
-                            @Override
-                            public void run() {
-                                try {
-                                    final GraphDocument document = parser.parse();
-                                    if (document != null) {
-                                        SwingUtilities.invokeLater(() -> {
-                                            component.requestActive();
-                                            component.getDocument().addGraphDocument(document);
-                                        });
-                                    }
-                                } catch (IOException ex) {
-                                    Exceptions.printStackTrace(ex);
-                                }
-                                handle.finish();
-                                long stop = System.currentTimeMillis();
-                                Logger.getLogger(getClass().getName()).log(Level.INFO, "Loaded in " + file + " in " + ((stop - startTime) / 1000.0) + " seconds");
-                            }
-                        });
-                } catch (IOException ex) {
-                    Exceptions.printStackTrace(ex);
-                }
-            }
-        }
+        OutlineTopComponent.findInstance().importFromXML();
     }
 
     @Override
     public String getName() {
         return NbBundle.getMessage(ImportAction.class, "CTL_ImportAction");
     }
 
-    public ImportAction() {
-        putValue(Action.SHORT_DESCRIPTION, "Open");
-        // D is the Control key on most platforms, the Command (meta) key on Macintosh
-        putValue(Action.ACCELERATOR_KEY, Utilities.stringToKey("D-O"));
-    }
-
     @Override
     public HelpCtx getHelpCtx() {
         return HelpCtx.DEFAULT_HELP;

src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/OpenAction.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package com.sun.hotspot.igv.coordinator.actions;
+
+import com.sun.hotspot.igv.coordinator.OutlineTopComponent;
+import javax.swing.Action;
+import org.openide.util.HelpCtx;
+import org.openide.util.ImageUtilities;
+import org.openide.util.NbBundle;
+import org.openide.util.Utilities;
+import org.openide.util.actions.CallableSystemAction;
+
+public final class OpenAction extends CallableSystemAction {
+
+    public OpenAction() {
+        putValue(Action.SHORT_DESCRIPTION, "Open...");
+        // D is the Control key on most platforms, the Command (meta) key on Macintosh
+        putValue(Action.ACCELERATOR_KEY, Utilities.stringToKey("D-O"));
+        putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon(iconResource(), true));
+    }
+
+    @Override
+    public void performAction() {
+        OutlineTopComponent.findInstance().openFile();
+    }
+
+    @Override
+    public String getName() {
+        return NbBundle.getMessage(OpenAction.class, "CTL_OpenAction");
+    }
+
+    @Override
+    public HelpCtx getHelpCtx() {
+        return HelpCtx.DEFAULT_HELP;
+    }
+
+    @Override
+    protected boolean asynchronous() {
+        return false;
+    }
+
+    @Override
+    protected String iconResource() {
+        return "com/sun/hotspot/igv/coordinator/images/open.png";
+    }
+}

src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 import javax.swing.Action;
 import org.openide.nodes.Node;
 import org.openide.util.HelpCtx;
+import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
 import org.openide.util.actions.NodeAction;
 
@@ -37,6 +38,11 @@
  */
 public final class RemoveAction extends NodeAction {
 
+    public RemoveAction() {
+        putValue(Action.SHORT_DESCRIPTION, getName());
+        putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon(iconResource(), true));
+    }
+
     @Override
     protected void performAction(Node[] activatedNodes) {
         for (Node n : activatedNodes) {
@@ -47,10 +53,6 @@ protected void performAction(Node[] activatedNodes) {
         }
     }
 
-    public RemoveAction() {
-        putValue(Action.SHORT_DESCRIPTION, getName());
-    }
-
     @Override
     public String getName() {
         return NbBundle.getMessage(RemoveAction.class, "CTL_RemoveAction");

src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 import com.sun.hotspot.igv.coordinator.OutlineTopComponent;
 import javax.swing.Action;
 import org.openide.util.HelpCtx;
+import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 
@@ -42,7 +43,8 @@ public String getName() {
     }
 
     public RemoveAllAction() {
-        putValue(Action.SHORT_DESCRIPTION, "Remove all graphs and groups");
+        putValue(Action.SHORT_DESCRIPTION, "Clear workspace");
+        putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon(iconResource(), true));
     }
 
     @Override
@@ -62,6 +64,6 @@ protected boolean asynchronous() {
 
     @Override
     public void performAction() {
-        OutlineTopComponent.findInstance().clear();
+        OutlineTopComponent.findInstance().clearWorkspace();
     }
 }

src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java → src/utils/IdealGraphVisualizer/Coordinator/src/main/java/com/sun/hotspot/igv/coordinator/actions/SaveAction.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,37 +27,34 @@
 import com.sun.hotspot.igv.coordinator.OutlineTopComponent;
 import javax.swing.Action;
 import org.openide.util.HelpCtx;
+import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
 import org.openide.util.Utilities;
 import org.openide.util.actions.CallableSystemAction;
 
-/**
- *
- * @author Thomas Wuerthinger
- */
 
-public final class SaveAllAction extends CallableSystemAction {
+public final class SaveAction extends CallableSystemAction {
+
+    public SaveAction() {
+        putValue(Action.SHORT_DESCRIPTION, "Save");
+        // D is the Control key on most platforms, the Command (meta) key on Macintosh
+        putValue(Action.ACCELERATOR_KEY, Utilities.stringToKey("D-S"));
+        putValue(Action.SMALL_ICON, ImageUtilities.loadImageIcon(iconResource(), true));
+    }
 
     @Override
     public void performAction() {
-        final OutlineTopComponent component = OutlineTopComponent.findInstance();
-        SaveAsAction.save(component.getDocument());
+        OutlineTopComponent.findInstance().save();
     }
 
     @Override
     public String getName() {
-        return NbBundle.getMessage(SaveAllAction.class, "CTL_SaveAllAction");
-    }
-
-    public SaveAllAction() {
-        putValue(Action.SHORT_DESCRIPTION, "Save all groups to XML file...");
-        // D is the Control key on most platforms, the Command (meta) key on Macintosh
-        putValue(Action.ACCELERATOR_KEY, Utilities.stringToKey("D-S"));
+        return NbBundle.getMessage(SaveAction.class, "CTL_SaveAction");
     }
 
     @Override
     protected String iconResource() {
-        return "com/sun/hotspot/igv/coordinator/images/saveall.gif";
+        return "com/sun/hotspot/igv/coordinator/images/save.png";
     }
 
     @Override