Skip to content

Commit 1467604

Browse files
c-reficetkrodriguez
c-refice
authored and
tkrodriguez
committed
Refactor IGV sources for sharing with Graal
1 parent ba4c7ac commit 1467604

File tree

285 files changed

+3710
-8300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

285 files changed

+3710
-8300
lines changed

‎visualizer/IdealGraphVisualizer/Bytecodes/src/main/java/org/graalvm/visualizer/bytecodes/BytecodeNode.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
*/
2323
package org.graalvm.visualizer.bytecodes;
2424

25-
import org.graalvm.visualizer.data.InputBytecode;
26-
import org.graalvm.visualizer.data.InputGraph;
27-
import org.graalvm.visualizer.data.InputNode;
28-
import org.graalvm.visualizer.data.Properties;
29-
import org.graalvm.visualizer.data.Properties.EqualityPropertyMatcher;
25+
import jdk.graal.compiler.graphio.parsing.model.InputBytecode;
26+
import jdk.graal.compiler.graphio.parsing.model.InputGraph;
27+
import jdk.graal.compiler.graphio.parsing.model.InputNode;
28+
import jdk.graal.compiler.graphio.parsing.model.Properties;
29+
import jdk.graal.compiler.graphio.parsing.model.Properties.EqualityPropertyMatcher;
3030
import org.openide.nodes.AbstractNode;
3131
import org.openide.nodes.Children;
3232
import org.openide.nodes.Node;

‎visualizer/IdealGraphVisualizer/Bytecodes/src/main/java/org/graalvm/visualizer/bytecodes/BytecodeViewTopComponent.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,15 @@
2222
*/
2323
package org.graalvm.visualizer.bytecodes;
2424

25-
import org.graalvm.visualizer.data.Group;
26-
import org.graalvm.visualizer.data.InputGraph;
25+
import java.awt.*;
26+
import java.io.Serializable;
27+
import java.lang.ref.Reference;
28+
import java.lang.ref.WeakReference;
29+
30+
import javax.swing.*;
31+
import javax.swing.event.ChangeEvent;
32+
import javax.swing.event.ChangeListener;
33+
2734
import org.graalvm.visualizer.data.SuppressFBWarnings;
2835
import org.graalvm.visualizer.data.services.GraphViewer;
2936
import org.graalvm.visualizer.data.services.InputGraphProvider;
@@ -37,18 +44,13 @@
3744
import org.openide.windows.TopComponent;
3845
import org.openide.windows.WindowManager;
3946

40-
import javax.swing.SwingUtilities;
41-
import javax.swing.event.ChangeEvent;
42-
import javax.swing.event.ChangeListener;
43-
import java.awt.BorderLayout;
44-
import java.io.Serializable;
45-
import java.lang.ref.Reference;
46-
import java.lang.ref.WeakReference;
47+
import jdk.graal.compiler.graphio.parsing.model.Group;
48+
import jdk.graal.compiler.graphio.parsing.model.InputGraph;
4749

4850
final class BytecodeViewTopComponent extends TopComponent implements ExplorerManager.Provider, ChangeListener {
4951
private static BytecodeViewTopComponent instance;
5052
private static final String PREFERRED_ID = "BytecodeViewTopComponent";
51-
private static final InputGraph EMPTY = new InputGraph("");
53+
private static final InputGraph EMPTY = new InputGraph(null, InputGraph.INVALID_INDEX, "", new Object[0]);
5254

5355
private final ExplorerManager manager;
5456
private final BeanTreeView treeView;

‎visualizer/IdealGraphVisualizer/Bytecodes/src/main/java/org/graalvm/visualizer/bytecodes/MethodNode.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
*/
2323
package org.graalvm.visualizer.bytecodes;
2424

25-
import org.graalvm.visualizer.data.InputBytecode;
26-
import org.graalvm.visualizer.data.InputGraph;
27-
import org.graalvm.visualizer.data.InputMethod;
25+
import jdk.graal.compiler.graphio.parsing.model.InputBytecode;
26+
import jdk.graal.compiler.graphio.parsing.model.InputGraph;
27+
import jdk.graal.compiler.graphio.parsing.model.InputMethod;
2828
import org.openide.nodes.AbstractNode;
2929
import org.openide.nodes.Children;
3030
import org.openide.nodes.Node;

‎visualizer/IdealGraphVisualizer/Bytecodes/src/main/java/org/graalvm/visualizer/bytecodes/SelectBytecodesCookie.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
package org.graalvm.visualizer.bytecodes;
2424

25-
import org.graalvm.visualizer.data.InputNode;
25+
import jdk.graal.compiler.graphio.parsing.model.InputNode;
2626
import org.openide.nodes.Node;
2727

2828
import java.util.Collections;

‎visualizer/IdealGraphVisualizer/ControlFlow/src/main/java/org/graalvm/visualizer/controlflow/BlockConnectionWidget.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
package org.graalvm.visualizer.controlflow;
2424

25-
import org.graalvm.visualizer.data.InputBlockEdge;
25+
import jdk.graal.compiler.graphio.parsing.model.InputBlockEdge;
2626
import org.graalvm.visualizer.layout.Link;
2727
import org.graalvm.visualizer.layout.Port;
2828
import org.netbeans.api.visual.widget.ConnectionWidget;

‎visualizer/IdealGraphVisualizer/ControlFlow/src/main/java/org/graalvm/visualizer/controlflow/BlockWidget.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
package org.graalvm.visualizer.controlflow;
2424

25-
import org.graalvm.visualizer.data.InputBlock;
25+
import jdk.graal.compiler.graphio.parsing.model.InputBlock;
2626
import org.graalvm.visualizer.layout.Cluster;
2727
import org.graalvm.visualizer.layout.Port;
2828
import org.graalvm.visualizer.layout.Vertex;

‎visualizer/IdealGraphVisualizer/ControlFlow/src/main/java/org/graalvm/visualizer/controlflow/ControlFlowScene.java

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
*/
2323
package org.graalvm.visualizer.controlflow;
2424

25-
import org.graalvm.visualizer.data.InputBlock;
26-
import org.graalvm.visualizer.data.InputBlockEdge;
27-
import org.graalvm.visualizer.data.InputGraph;
28-
import org.graalvm.visualizer.data.InputNode;
25+
import java.awt.*;
26+
import java.util.ArrayList;
27+
import java.util.Collection;
28+
import java.util.HashSet;
29+
import java.util.Set;
30+
import java.util.stream.Collectors;
31+
32+
import javax.swing.*;
33+
2934
import org.graalvm.visualizer.data.services.InputGraphProvider;
30-
import org.netbeans.api.visual.action.ActionFactory;
31-
import org.netbeans.api.visual.action.MoveProvider;
32-
import org.netbeans.api.visual.action.RectangularSelectDecorator;
33-
import org.netbeans.api.visual.action.RectangularSelectProvider;
34-
import org.netbeans.api.visual.action.SelectProvider;
35-
import org.netbeans.api.visual.action.WidgetAction;
35+
import org.netbeans.api.visual.action.*;
3636
import org.netbeans.api.visual.anchor.AnchorFactory;
3737
import org.netbeans.api.visual.anchor.AnchorShape;
3838
import org.netbeans.api.visual.graph.GraphScene;
@@ -42,18 +42,14 @@
4242
import org.netbeans.api.visual.widget.LayerWidget;
4343
import org.netbeans.api.visual.widget.Widget;
4444

45-
import javax.swing.BorderFactory;
46-
import java.awt.Color;
47-
import java.awt.Point;
48-
import java.awt.Rectangle;
49-
import java.util.ArrayList;
50-
import java.util.Collection;
51-
import java.util.HashSet;
52-
import java.util.Set;
53-
import java.util.stream.Collectors;
45+
import jdk.graal.compiler.graphio.parsing.model.InputBlock;
46+
import jdk.graal.compiler.graphio.parsing.model.InputBlockEdge;
47+
import jdk.graal.compiler.graphio.parsing.model.InputGraph;
48+
import jdk.graal.compiler.graphio.parsing.model.InputNode;
5449

5550
public class ControlFlowScene extends GraphScene<InputBlock, InputBlockEdge> implements SelectProvider, MoveProvider, RectangularSelectDecorator, RectangularSelectProvider {
56-
private static final InputGraph EMPTY = new InputGraph("");
51+
private static final InputGraph EMPTY = new InputGraph(null, InputGraph.INVALID_INDEX, "", new Object[0]);
52+
5753
private final HashSet<BlockWidget> selection;
5854
private InputGraphProvider provider;
5955
private final LayerWidget edgeLayer;

‎visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/OutlineTopComponent.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
import org.graalvm.visualizer.coordinator.actions.SaveAsAction;
3232
import org.graalvm.visualizer.coordinator.impl.SessionManagerImpl;
3333
import org.graalvm.visualizer.coordinator.impl.SessionNode;
34-
import org.graalvm.visualizer.data.ChangedListener;
35-
import org.graalvm.visualizer.data.FolderElement;
36-
import org.graalvm.visualizer.data.GraphDocument;
37-
import org.graalvm.visualizer.data.InputGraph;
34+
import jdk.graal.compiler.graphio.parsing.model.ChangedListener;
35+
import jdk.graal.compiler.graphio.parsing.model.FolderElement;
36+
import jdk.graal.compiler.graphio.parsing.model.GraphDocument;
37+
import jdk.graal.compiler.graphio.parsing.model.InputGraph;
3838
import org.graalvm.visualizer.data.services.GraphViewer;
3939
import org.graalvm.visualizer.data.services.InputGraphProvider;
4040
import org.graalvm.visualizer.util.ExternalDropTarget;
@@ -63,8 +63,7 @@
6363
import org.openide.windows.TopComponent;
6464
import org.openide.windows.WindowManager;
6565

66-
import javax.swing.JComponent;
67-
import javax.swing.UIManager;
66+
import javax.swing.*;
6867
import javax.swing.border.Border;
6968
import javax.swing.event.ChangeEvent;
7069
import javax.swing.event.ChangeListener;
@@ -192,7 +191,7 @@ protected void addNotify() {
192191

193192
@Override
194193
public void changed(SessionManagerImpl source) {
195-
setKeys(impl.getSessions());
194+
SwingUtilities.invokeLater(() -> setKeys(impl.getSessions()));
196195
}
197196

198197
@Override

‎visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/CloneGraphAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
package org.graalvm.visualizer.coordinator.actions;
2525

26-
import org.graalvm.visualizer.data.InputGraph;
26+
import jdk.graal.compiler.graphio.parsing.model.InputGraph;
2727
import org.graalvm.visualizer.data.services.GraphViewer;
2828
import org.graalvm.visualizer.data.services.InputGraphProvider;
2929
import org.openide.nodes.Node;

‎visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/DiffGraphCookie.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
*/
2323
package org.graalvm.visualizer.coordinator.actions;
2424

25-
import org.graalvm.visualizer.data.Group;
26-
import org.graalvm.visualizer.data.InputGraph;
25+
import jdk.graal.compiler.graphio.parsing.model.Group;
26+
import jdk.graal.compiler.graphio.parsing.model.InputGraph;
2727
import org.graalvm.visualizer.data.services.GraphViewer;
2828
import org.graalvm.visualizer.data.services.InputGraphProvider;
2929
import org.graalvm.visualizer.difference.Difference;

‎visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/GraphCloneCookie.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
package org.graalvm.visualizer.coordinator.actions;
2424

25-
import org.graalvm.visualizer.data.InputGraph;
25+
import jdk.graal.compiler.graphio.parsing.model.InputGraph;
2626
import org.graalvm.visualizer.data.services.GraphViewer;
2727
import org.openide.nodes.Node;
2828

‎visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/GraphOpenCookie.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
package org.graalvm.visualizer.coordinator.actions;
2424

25-
import org.graalvm.visualizer.data.InputGraph;
25+
import jdk.graal.compiler.graphio.parsing.model.InputGraph;
2626
import org.graalvm.visualizer.data.services.GraphViewer;
2727
import org.openide.cookies.OpenCookie;
2828

‎visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/GraphRemoveCookie.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
package org.graalvm.visualizer.coordinator.actions;
2424

25-
import org.graalvm.visualizer.data.InputGraph;
25+
import jdk.graal.compiler.graphio.parsing.model.InputGraph;
2626

2727
public class GraphRemoveCookie implements RemoveCookie {
2828
private final InputGraph graph;

‎visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/SaveActionPerformer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
*/
2323
package org.graalvm.visualizer.coordinator.actions;
2424

25-
import org.graalvm.visualizer.data.GraphDocument;
26-
import org.graalvm.visualizer.data.KnownPropertyNames;
25+
import jdk.graal.compiler.graphio.parsing.model.GraphDocument;
26+
import jdk.graal.compiler.graphio.parsing.model.KnownPropertyNames;
2727
import org.graalvm.visualizer.settings.graal.GraalSettings;
2828
import org.openide.awt.StatusDisplayer;
2929
import org.openide.util.NbBundle;

‎visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/SaveAsAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
package org.graalvm.visualizer.coordinator.actions;
2525

2626
import org.graalvm.visualizer.coordinator.impl.SessionManagerImpl;
27-
import org.graalvm.visualizer.data.Folder;
27+
import jdk.graal.compiler.graphio.parsing.model.Folder;
2828
import org.openide.nodes.Node;
2929
import org.openide.util.HelpCtx;
3030
import org.openide.util.Lookup;

‎visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/SaveOperation.java

Lines changed: 17 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,22 @@
2222
*/
2323
package org.graalvm.visualizer.coordinator.actions;
2424

25+
import java.io.File;
26+
import java.io.IOException;
27+
import java.io.InterruptedIOException;
28+
import java.nio.file.Files;
29+
import java.nio.file.Path;
30+
import java.nio.file.Paths;
31+
import java.nio.file.StandardCopyOption;
32+
import java.util.*;
33+
import java.util.concurrent.CancellationException;
34+
import java.util.concurrent.atomic.AtomicBoolean;
35+
import java.util.concurrent.atomic.AtomicReference;
36+
import java.util.function.Consumer;
37+
2538
import org.graalvm.visualizer.coordinator.impl.SessionManagerImpl;
26-
import org.graalvm.visualizer.data.Folder;
27-
import org.graalvm.visualizer.data.FolderElement;
28-
import org.graalvm.visualizer.data.GraphDocument;
29-
import org.graalvm.visualizer.data.Group;
30-
import org.graalvm.visualizer.data.InputGraph;
31-
import org.graalvm.visualizer.data.KnownPropertyNames;
32-
import org.graalvm.visualizer.data.Properties;
33-
import org.graalvm.visualizer.data.serialization.DataBinaryWriter;
39+
import jdk.graal.compiler.graphio.parsing.model.*;
40+
import jdk.graal.compiler.graphio.parsing.model.Properties;
3441
import org.netbeans.api.progress.BaseProgressUtils;
3542
import org.netbeans.api.progress.ProgressHandle;
3643
import org.openide.DialogDescriptor;
@@ -42,30 +49,7 @@
4249
import org.openide.util.Lookup;
4350
import org.openide.util.NbBundle;
4451

45-
import java.io.File;
46-
import java.io.IOException;
47-
import java.io.InterruptedIOException;
48-
import java.nio.file.Files;
49-
import java.nio.file.Path;
50-
import java.nio.file.Paths;
51-
import java.nio.file.StandardCopyOption;
52-
import java.util.ArrayDeque;
53-
import java.util.ArrayList;
54-
import java.util.Collection;
55-
import java.util.Deque;
56-
import java.util.HashMap;
57-
import java.util.HashSet;
58-
import java.util.Iterator;
59-
import java.util.LinkedHashMap;
60-
import java.util.List;
61-
import java.util.Locale;
62-
import java.util.Map;
63-
import java.util.Queue;
64-
import java.util.Set;
65-
import java.util.concurrent.CancellationException;
66-
import java.util.concurrent.atomic.AtomicBoolean;
67-
import java.util.concurrent.atomic.AtomicReference;
68-
import java.util.function.Consumer;
52+
import jdk.graal.compiler.graphio.parsing.DataBinaryWriter;
6953

7054
/**
7155
* @author sdedic
@@ -75,7 +59,7 @@ class SaveOperation {
7559
* Provides a path to save the document into.
7660
*/
7761
public interface DocumentPathProvider {
78-
public Path createPath(Path suggestedPath, GraphDocument document);
62+
Path createPath(Path suggestedPath, GraphDocument document);
7963
}
8064

8165
private final SessionManagerImpl sessionMgr;

‎visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/AbstractOutlineNode.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
package org.graalvm.visualizer.coordinator.impl;
2525

26-
import org.graalvm.visualizer.data.FolderElement;
27-
import org.graalvm.visualizer.data.KnownPropertyNames;
28-
import org.graalvm.visualizer.data.Properties;
26+
import jdk.graal.compiler.graphio.parsing.model.FolderElement;
27+
import jdk.graal.compiler.graphio.parsing.model.KnownPropertyNames;
28+
import jdk.graal.compiler.graphio.parsing.model.Properties;
2929
import org.openide.actions.RenameAction;
3030
import org.openide.nodes.AbstractNode;
3131
import org.openide.nodes.Children;

0 commit comments

Comments
 (0)