PlotView: Move keybindings to parent frame

Author: babaissarkar

src/main/java/com/babai/ssplot/ui/MainFrame.java

@@ -26,6 +26,7 @@
 import java.awt.Color;
 import java.awt.Desktop;
 import java.awt.Dimension;
+import java.awt.event.ActionEvent;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.awt.image.BufferedImage;
@@ -38,12 +39,14 @@
 import java.util.Properties;
 
 import javax.imageio.ImageIO;
+import javax.swing.AbstractAction;
 import javax.swing.ButtonGroup;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JColorChooser;
 import javax.swing.JComboBox;
+import javax.swing.JComponent;
 import javax.swing.JDesktopPane;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
@@ -343,6 +346,25 @@ public void componentResized(ComponentEvent ce) {
 			}
 		});
 
+		// Setting Keybinding for movement
+		// Keybindings for movement and actions
+		bindAction(ifrmPlot, "left",   "LEFT",  pv::moveLeft);
+		bindAction(ifrmPlot, "right",  "RIGHT", pv::moveRight);
+		bindAction(ifrmPlot, "up",     "UP",    pv::moveUp);
+		bindAction(ifrmPlot, "down",   "DOWN",  pv::moveDown);
+
+		bindAction(ifrmPlot, "plus",   "J", pv::zoomIn);
+		bindAction(ifrmPlot, "minus",  "F", pv::zoomOut);
+		bindAction(ifrmPlot, "splus",  "H", pv::smallZoomIn);
+		bindAction(ifrmPlot, "sminus", "G", pv::smallZoomOut);
+
+		bindAction(ifrmPlot, "rotAp",  "Q", pv::rotateXPlus);
+		bindAction(ifrmPlot, "rotAm",  "A", pv::rotateXMinus);
+		bindAction(ifrmPlot, "rotBp",  "W", pv::rotateYPlus);
+		bindAction(ifrmPlot, "rotBm",  "S", pv::rotateYMinus);
+		bindAction(ifrmPlot, "rotCp",  "E", pv::rotateZPlus);
+		bindAction(ifrmPlot, "rotCm",  "D", pv::rotateZMinus);
+		
 		JToolBar toolbar = new JToolBar();
 
 		// --- Zoom Section ---
@@ -488,6 +510,17 @@ public void componentResized(ComponentEvent ce) {
 		setExtendedState(JFrame.MAXIMIZED_BOTH);
 	}
 
+	/* Actions */
+	private void bindAction(JComponent control, String actionName, String hotkey, Runnable action) {
+		control.getInputMap().put(KeyStroke.getKeyStroke(hotkey), actionName);
+		control.getActionMap().put(actionName, new AbstractAction() {
+			@Override
+			public void actionPerformed(ActionEvent arg0) {
+				action.run();
+			}
+		});
+	}
+	
 	/* Menu Actions */
 	public void saveImage() {
 		var files = new JFileChooser();

src/main/java/com/babai/ssplot/ui/PlotView.java

@@ -27,7 +27,6 @@
 
 import java.awt.Color;
 import java.awt.Graphics;
-import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
@@ -36,9 +35,7 @@
 import java.util.Optional;
 import java.util.Vector;
 
-import javax.swing.AbstractAction;
 import javax.swing.JLabel;
-import javax.swing.KeyStroke;
 import javax.swing.Timer;
 
 import com.babai.ssplot.math.plot.PlotData;
@@ -78,25 +75,7 @@ public PlotView(StatLogger logger, Plotter plt) {
 		// Mouse Listener
 		addMouseListener(this);
 		addMouseMotionListener(this);
-
-		// Setting Keybinding for movement
-		// Keybindings for movement and actions
-		bindAction("left",   "LEFT",  this::moveLeft);
-		bindAction("right",  "RIGHT", this::moveRight);
-		bindAction("up",     "UP",    this::moveUp);
-		bindAction("down",   "DOWN",  this::moveDown);
-
-		bindAction("plus",   "J", this::zoomIn);
-		bindAction("minus",  "F", this::zoomOut);
-		bindAction("splus",  "H", this::smallZoomIn);
-		bindAction("sminus", "G", this::smallZoomOut);
-
-		bindAction("rotAp",  "Q", this::rotateXPlus);
-		bindAction("rotAm",  "A", this::rotateXMinus);
-		bindAction("rotBp",  "W", this::rotateYPlus);
-		bindAction("rotBm",  "S", this::rotateYMinus);
-		bindAction("rotCp",  "E", this::rotateZPlus);
-		bindAction("rotCm",  "D", this::rotateZMinus);
+		setFocusable(true);
 	}
 
 	@Override
@@ -214,17 +193,6 @@ public void resize(int w, int h) {
 		plt.initPlot(w, h);
 		repaint();
 	}
-
-	/* Actions */
-	private void bindAction(String actionName, String hotkey, Runnable action) {
-		getInputMap().put(KeyStroke.getKeyStroke(hotkey), actionName);
-		getActionMap().put(actionName, new AbstractAction() {
-			@Override
-			public void actionPerformed(ActionEvent arg0) {
-				action.run();
-			}
-		});
-	}
 
 	public void zoomIn() {
 		plt.zoomIn(0,0);