8291799: IGV: make "Selection mode" a toggle button

Reviewed-by: kvn, thartmann, rcastanedalo

Author: tobiasholenstein

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

@@ -103,7 +103,6 @@ public final class EditorTopComponent extends TopComponent implements PropertyCh
     private PredSuccAction predSuccAction;
     private ShowEmptyBlocksAction showEmptyBlocksAction;
     private SelectionModeAction selectionModeAction;
-    private PanModeAction panModeAction;
     private boolean notFirstTime;
     private JComponent satelliteComponent;
     private JPanel centerPanel;
@@ -320,19 +319,9 @@ public void changed(DiagramViewModel source) {
         toolBar.add(redoAction);
 
         toolBar.addSeparator();
-        ButtonGroup interactionButtons = new ButtonGroup();
-
-        panModeAction = new PanModeAction();
-        panModeAction.setSelected(true);
-        button = new JToggleButton(panModeAction);
-        button.setSelected(true);
-        interactionButtons.add(button);
-        toolBar.add(button);
-        panModeAction.addPropertyChangeListener(this);
-
         selectionModeAction = new SelectionModeAction();
         button = new JToggleButton(selectionModeAction);
-        interactionButtons.add(button);
+        button.setSelected(false);
         toolBar.add(button);
         selectionModeAction.addPropertyChangeListener(this);
 
@@ -579,11 +568,12 @@ public void propertyChange(PropertyChangeEvent evt) {
         } else if (evt.getSource() == this.hideDuplicatesAction) {
             boolean b = (Boolean) hideDuplicatesAction.getValue(HideDuplicatesAction.STATE);
             this.getModel().setHideDuplicates(b);
-        } else if (evt.getSource() == this.selectionModeAction || evt.getSource() == this.panModeAction) {
-            if (panModeAction.isSelected()) {
-                scene.setInteractionMode(DiagramViewer.InteractionMode.PANNING);
-            } else if (selectionModeAction.isSelected()) {
+        } else if (evt.getSource() == this.selectionModeAction) {
+            boolean b = (Boolean) selectionModeAction.getValue(SelectionModeAction.STATE);
+            if (b) {
                 scene.setInteractionMode(DiagramViewer.InteractionMode.SELECTION);
+            } else {
+                scene.setInteractionMode(DiagramViewer.InteractionMode.PANNING);
             }
         } else {
             assert false : "Unknown event source";

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

@@ -31,27 +31,28 @@
 
 public class SelectionModeAction extends AbstractAction {
 
+    private boolean state;
+
+    public static final String STATE = "state";
+
     public SelectionModeAction() {
         putValue(AbstractAction.SMALL_ICON, new ImageIcon(ImageUtilities.loadImage(iconResource())));
-        putValue(SELECTED_KEY, false);
         putValue(Action.SHORT_DESCRIPTION, "Selection mode");
+        state = false;
+        putValue(STATE, false);
     }
 
-    public boolean isSelected() {
-        return (Boolean)getValue(SELECTED_KEY);
+    @Override
+    public void actionPerformed(ActionEvent ev) {
+        setState(!state);
     }
 
-    public void setSelected(boolean b) {
-        if (isSelected() != b) {
-            this.putValue(SELECTED_KEY, b);
-        }
+    public void setState(boolean b) {
+        this.putValue(STATE, b);
+        this.state = b;
     }
 
     protected String iconResource() {
         return "com/sun/hotspot/igv/view/images/selection_mode.png";
     }
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-    }
 }