Skip to content

Commit 4120db1

Browse files
tobiasholensteintobiasholenstein
committedNov 17, 2022
8297007: IGV: Link/Unlink node selection of open tabs
Reviewed-by: rcastanedalo, chagedorn
1 parent 38eb80d commit 4120db1

File tree

15 files changed

+159
-38
lines changed

15 files changed

+159
-38
lines changed
 

‎src/utils/IdealGraphVisualizer/Coordinator/src/main/resources/com/sun/hotspot/igv/coordinator/layer.xml

+4
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,10 @@
178178
<attr name="originalFile" stringvalue="Actions/Window/org-netbeans-modules-options-OptionsWindowAction.instance"/>
179179
<attr name="position" intvalue="1"/>
180180
</file>
181+
<file name="SeparatorOptions.instance">
182+
<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
183+
<attr name="position" intvalue="50"/>
184+
</file>
181185
</folder>
182186

183187
<folder name="Window">

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramScene.java

+23-19
Original file line numberDiff line numberDiff line change
@@ -187,36 +187,40 @@ public ChangedEvent<DiagramViewer> getZoomChangedEvent() {
187187

188188
@Override
189189
public void filteredChanged(SelectionCoordinator coordinator) {
190-
Set<Integer> ids = coordinator.getHighlightedObjects();
191-
Set<Object> result = new HashSet<>();
192-
for (Figure figure : getModel().getDiagram().getFigures()) {
193-
if (ids.contains(figure.getInputNode().getId())) {
194-
result.add(figure);
195-
}
196-
for (Slot slot : figure.getSlots()) {
197-
if (!Collections.disjoint(slot.getSource().getSourceNodesAsSet(), ids)) {
198-
result.add(slot);
190+
if (model.getGlobalSelection()) {
191+
Set<Integer> ids = coordinator.getHighlightedObjects();
192+
Set<Object> highlightedObjects = new HashSet<>();
193+
for (Figure figure : getModel().getDiagram().getFigures()) {
194+
if (ids.contains(figure.getInputNode().getId())) {
195+
highlightedObjects.add(figure);
196+
}
197+
for (Slot slot : figure.getSlots()) {
198+
if (!Collections.disjoint(slot.getSource().getSourceNodesAsSet(), ids)) {
199+
highlightedObjects.add(slot);
200+
}
199201
}
200202
}
203+
setHighlightedObjects(highlightedObjects);
204+
validateAll();
201205
}
202-
setHighlightedObjects(result);
203-
validateAll();
204206
}
205207
};
206208
private final ControllableChangedListener<SelectionCoordinator> selectedCoordinatorListener = new ControllableChangedListener<SelectionCoordinator>() {
207209

208210
@Override
209211
public void filteredChanged(SelectionCoordinator coordinator) {
210-
Set<Integer> ids = coordinator.getSelectedObjects();
211-
Set<Figure> figures = new HashSet<>();
212-
for (Figure figure : getModel().getDiagram().getFigures()) {
213-
if (ids.contains(figure.getInputNode().getId())) {
214-
figures.add(figure);
212+
if (model.getGlobalSelection()) {
213+
Set<Integer> ids = coordinator.getSelectedObjects();
214+
Set<Figure> selectedFigures = new HashSet<>();
215+
for (Figure figure : getModel().getDiagram().getFigures()) {
216+
if (ids.contains(figure.getInputNode().getId())) {
217+
selectedFigures.add(figure);
218+
}
215219
}
220+
setFigureSelection(selectedFigures);
221+
centerSelectedFigures();
222+
validateAll();
216223
}
217-
setFigureSelection(figures);
218-
centerSelectedFigures();
219-
validateAll();
220224
}
221225
};
222226

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java

+12
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.sun.hotspot.igv.graph.MatcherSelector;
3636
import com.sun.hotspot.igv.settings.Settings;
3737
import com.sun.hotspot.igv.util.RangeSliderModel;
38+
import com.sun.hotspot.igv.view.actions.GlobalSelectionAction;
3839
import java.awt.Color;
3940
import java.util.*;
4041
import java.util.function.Consumer;
@@ -65,13 +66,23 @@ public class DiagramViewModel extends RangeSliderModel implements ChangedListene
6566
private boolean showNodeHull;
6667
private boolean showEmptyBlocks;
6768
private boolean hideDuplicates;
69+
private static boolean globalSelection = false;
6870

6971
private final ChangedListener<FilterChain> filterChainChangedListener = source -> filterChanged();
7072

7173
public Group getGroup() {
7274
return group;
7375
}
7476

77+
public boolean getGlobalSelection() {
78+
return globalSelection;
79+
}
80+
81+
public void setGlobalSelection(boolean enable) {
82+
globalSelection = enable;
83+
diagramChangedEvent.fire();
84+
}
85+
7586
public boolean getShowSea() {
7687
return showSea;
7788
}
@@ -139,6 +150,7 @@ public DiagramViewModel(InputGraph graph, FilterChain filterChain, FilterChain s
139150

140151
this.filterChain = filterChain;
141152
this.sequenceFilterChain = sequenceFilterChain;
153+
globalSelection = GlobalSelectionAction.get(GlobalSelectionAction.class).isSelected();
142154
showSea = Settings.get().getInt(Settings.DEFAULT_VIEW, Settings.DEFAULT_VIEW_DEFAULT) == Settings.DefaultView.SEA_OF_NODES;
143155
showBlocks = Settings.get().getInt(Settings.DEFAULT_VIEW, Settings.DEFAULT_VIEW_DEFAULT) == Settings.DefaultView.CLUSTERED_SEA_OF_NODES;
144156
showCFG = Settings.get().getInt(Settings.DEFAULT_VIEW, Settings.DEFAULT_VIEW_DEFAULT) == Settings.DefaultView.CONTROL_FLOW_GRAPH;

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public final class EditorTopComponent extends TopComponent {
7575
private static final String SATELLITE_STRING = "satellite";
7676
private static final String SCENE_STRING = "scene";
7777

78-
7978
public EditorTopComponent(InputGraph graph) {
8079
initComponents();
8180

@@ -219,6 +218,10 @@ public void mouseMoved(MouseEvent e) {}
219218
toolBar.add(redoAction);
220219

221220
toolBar.addSeparator();
221+
222+
JToggleButton globalSelectionButton = new JToggleButton(GlobalSelectionAction.get(GlobalSelectionAction.class));
223+
globalSelectionButton.setHideActionText(true);
224+
toolBar.add(globalSelectionButton);
222225
toolBar.add(new JToggleButton(new SelectionModeAction()));
223226
toolBar.addSeparator();
224227
toolBar.add(new ZoomLevelAction(scene));

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExpandDiffAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ protected String iconResource() {
5252

5353
@Override
5454
public String getName() {
55-
return NbBundle.getMessage(NextDiagramAction.class, "CTL_ExpandDiffAction");
55+
return NbBundle.getMessage(ExpandDiffAction.class, "CTL_ExpandDiffAction");
5656
}
5757

5858
@Override
5959
protected String getDescription() {
60-
return NbBundle.getMessage(NextDiagramAction.class, "HINT_ExpandDiffAction");
60+
return NbBundle.getMessage(ExpandDiffAction.class, "HINT_ExpandDiffAction");
6161
}
6262

6363
@Override

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExtractAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ protected String iconResource() {
5454

5555
@Override
5656
protected String getDescription() {
57-
return NbBundle.getMessage(NextDiagramAction.class, "HINT_ExtractAction");
57+
return NbBundle.getMessage(ExtractAction.class, "HINT_ExtractAction");
5858
}
5959

6060
@Override
6161
public String getName() {
62-
return NbBundle.getMessage(NextDiagramAction.class, "CTL_ExtractAction");
62+
return NbBundle.getMessage(ExtractAction.class, "CTL_ExtractAction");
6363
}
6464

6565
@Override

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/GlobalSelectionAction.java

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
/*
2+
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*
23+
*/
24+
package com.sun.hotspot.igv.view.actions;
25+
26+
import com.sun.hotspot.igv.view.EditorTopComponent;
27+
import javax.swing.AbstractAction;
28+
import javax.swing.Action;
29+
import javax.swing.ImageIcon;
30+
import javax.swing.SwingUtilities;
31+
import org.openide.awt.ActionID;
32+
import org.openide.awt.ActionReference;
33+
import org.openide.awt.ActionReferences;
34+
import org.openide.awt.ActionRegistration;
35+
import org.openide.util.HelpCtx;
36+
import org.openide.util.ImageUtilities;
37+
import org.openide.util.NbBundle;
38+
import org.openide.util.actions.CallableSystemAction;
39+
40+
@ActionID(category = "View", id = "com.sun.hotspot.igv.view.actions.GlobalSelectionAction")
41+
@ActionRegistration(displayName = "#CTL_GlobalSelectionAction")
42+
@ActionReferences({
43+
@ActionReference(path = "Menu/Options", position = 300),
44+
@ActionReference(path = "Shortcuts", name = "D-L")
45+
})
46+
@NbBundle.Messages({
47+
"CTL_GlobalSelectionAction=Link selection globally",
48+
"HINT_GlobalSelectionAction=Link node selection globally"
49+
})
50+
public final class GlobalSelectionAction extends CallableSystemAction {
51+
52+
private boolean isSelected;
53+
54+
public GlobalSelectionAction() {
55+
putValue(AbstractAction.SMALL_ICON, new ImageIcon(ImageUtilities.loadImage(iconResource())));
56+
putValue(Action.SHORT_DESCRIPTION, getDescription());
57+
putValue(SELECTED_KEY, false);
58+
isSelected = false;
59+
}
60+
61+
@Override
62+
public String getName() {
63+
return NbBundle.getMessage(GlobalSelectionAction.class, "CTL_GlobalSelectionAction");
64+
}
65+
66+
@Override
67+
public HelpCtx getHelpCtx() {
68+
return HelpCtx.DEFAULT_HELP;
69+
}
70+
71+
@Override
72+
public void performAction() {
73+
isSelected = !isSelected;
74+
putValue(SELECTED_KEY, isSelected);
75+
EditorTopComponent editor = EditorTopComponent.getActive();
76+
if (editor != null) {
77+
SwingUtilities.invokeLater(() -> editor.getModel().setGlobalSelection(isSelected));
78+
}
79+
}
80+
81+
public boolean isSelected() {
82+
return isSelected;
83+
}
84+
85+
private String getDescription() {
86+
return NbBundle.getMessage(GlobalSelectionAction.class, "HINT_GlobalSelectionAction");
87+
}
88+
89+
@Override
90+
protected boolean asynchronous() {
91+
return false;
92+
}
93+
94+
@Override
95+
public String iconResource() {
96+
return "com/sun/hotspot/igv/view/images/chain.png";
97+
}
98+
}

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/HideAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ protected String iconResource() {
5656

5757
@Override
5858
public String getName() {
59-
return NbBundle.getMessage(NextDiagramAction.class, "CTL_HideAction");
59+
return NbBundle.getMessage(HideAction.class, "CTL_HideAction");
6060
}
6161

6262
@Override
6363
protected String getDescription() {
64-
return NbBundle.getMessage(NextDiagramAction.class, "HINT_HideAction");
64+
return NbBundle.getMessage(HideAction.class, "HINT_HideAction");
6565
}
6666

6767
@Override

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ protected String iconResource() {
5454

5555
@Override
5656
public String getName() {
57-
return NbBundle.getMessage(NextDiagramAction.class, "CTL_PrevDiagramAction");
57+
return NbBundle.getMessage(PrevDiagramAction.class, "CTL_PrevDiagramAction");
5858
}
5959

6060
@Override
6161
protected String getDescription() {
62-
return NbBundle.getMessage(NextDiagramAction.class, "HINT_PrevDiagramAction");
62+
return NbBundle.getMessage(PrevDiagramAction.class, "HINT_PrevDiagramAction");
6363
}
6464

6565
@Override

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ReduceDiffAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ protected String iconResource() {
5252

5353
@Override
5454
protected String getDescription() {
55-
return NbBundle.getMessage(NextDiagramAction.class, "HINT_ReduceDiffAction");
55+
return NbBundle.getMessage(ReduceDiffAction.class, "HINT_ReduceDiffAction");
5656
}
5757

5858
@Override
5959
public String getName() {
60-
return NbBundle.getMessage(NextDiagramAction.class, "CTL_ReduceDiffAction");
60+
return NbBundle.getMessage(ReduceDiffAction.class, "CTL_ReduceDiffAction");
6161
}
6262

6363
@Override

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ShowAllAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ protected String iconResource() {
5555

5656
@Override
5757
protected String getDescription() {
58-
return NbBundle.getMessage(NextDiagramAction.class, "HINT_ShowAllAction");
58+
return NbBundle.getMessage(ShowAllAction.class, "HINT_ShowAllAction");
5959
}
6060

6161
@Override
6262
public String getName() {
63-
return NbBundle.getMessage(NextDiagramAction.class, "CTL_ShowAllAction");
63+
return NbBundle.getMessage(ShowAllAction.class, "CTL_ShowAllAction");
6464
}
6565

6666
@Override

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ZoomInAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ public void performAction() {
6666

6767
@Override
6868
public String getName() {
69-
return NbBundle.getMessage(NextDiagramAction.class, "CTL_ZoomInAction");
69+
return NbBundle.getMessage(ZoomInAction.class, "CTL_ZoomInAction");
7070
}
7171

7272
private String getDescription() {
73-
return NbBundle.getMessage(NextDiagramAction.class, "HINT_ZoomInAction");
73+
return NbBundle.getMessage(ZoomInAction.class, "HINT_ZoomInAction");
7474
}
7575

7676
@Override

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ZoomOutAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ public void performAction() {
6565

6666
@Override
6767
public String getName() {
68-
return NbBundle.getMessage(NextDiagramAction.class, "CTL_ZoomOutAction");
68+
return NbBundle.getMessage(ZoomOutAction.class, "CTL_ZoomOutAction");
6969
}
7070

7171
private String getDescription() {
72-
return NbBundle.getMessage(NextDiagramAction.class, "HINT_ZoomOutAction");
72+
return NbBundle.getMessage(ZoomOutAction.class, "HINT_ZoomOutAction");
7373
}
7474

7575
@Override

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ZoomResetAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ public void performAction() {
6161

6262
@Override
6363
public String getName() {
64-
return NbBundle.getMessage(NextDiagramAction.class, "CTL_ZoomResetAction");
64+
return NbBundle.getMessage(ZoomResetAction.class, "CTL_ZoomResetAction");
6565
}
6666

6767
private String getDescription() {
68-
return NbBundle.getMessage(NextDiagramAction.class, "HINT_ZoomResetAction");
68+
return NbBundle.getMessage(ZoomResetAction.class, "HINT_ZoomResetAction");
6969
}
7070

7171
@Override

0 commit comments

Comments
 (0)
Please sign in to comment.