Merge pull request #99 from UCSDOalads/addShortcutsByXYG

add shortcuts

Author: CVIllustrious

src/painttools/toolbar/ToolBar.java

@@ -8,10 +8,15 @@
 import javax.swing.JButton;
 import javax.swing.JPanel;
 
-import painttools.tools.*;
-
-
+import painttools.tools.AddClassTool;
+import painttools.tools.AddInputBoxTool;
+import painttools.tools.AddOutputBoxTool;
+import painttools.tools.DotTool;
+import painttools.tools.LineTool;
+import painttools.tools.PaintTool;
+import painttools.tools.SelectTool;
 import ui.PaintPanel;
+import ui.ShortcutHandler;
 
 public class ToolBar extends JPanel {
 
@@ -39,7 +44,8 @@ public ToolBar(PaintPanel panel) {
 		addTool(new AddOutputBoxTool(panel));
 
 		addTool(new LineTool());
-
+		
+		this.addKeyListener(new ShortcutHandler(panel));
 	}
 
 	/**

src/ui/PaintPanel.java

@@ -36,7 +36,8 @@ enum State {
 
 	private SelectTool selectTool;
 	private KeyHandler keyHandler;
-
+	private ShortcutHandler shortcutHandler;
+	
 	/**
 	 * @return the tempComponent
 	 */
@@ -90,6 +91,7 @@ public PaintPanel() {
 
 		this.components = new ArrayList<>();
 		this.keyHandler = new KeyHandler(this);
+		this.shortcutHandler = new ShortcutHandler(this);
 		this.addMouseListener(new MouseListener() {
 
 			@Override
@@ -156,7 +158,7 @@ public void keyReleased(KeyEvent e) {
 			@Override
 			public void keyPressed(KeyEvent e) {
 				// TODO Auto-generated method stub
-
+				shortcutHandler.keyPressed(e);
 			}
 		});
 	}

src/ui/ShortcutHandler.java

@@ -0,0 +1,93 @@
+package ui;
+
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+
+import actions.AddDataDisplayBoxAction;
+import actions.AddDataInputBoxAction;
+import actions.AddLazyJavaClassAction;
+import actions.FileSaveAs;
+import actions.RemovePaintComponent;
+
+/**
+ * Shortcuts for some actions
+ * 
+ * Ctrl + s: save
+ * Ctrl + r: remove
+ * Ctrl + i: add input box
+ * Ctrl + o: add output display box
+ * Ctrl + c: add a class
+ * @author Xiangyi Gong
+ */
+public class ShortcutHandler extends KeyAdapter {
+	
+	private PaintPanel panel;
+	
+	public ShortcutHandler(PaintPanel panel) {
+		this.panel = panel;
+	}
+	
+	@Override
+	public void keyPressed(KeyEvent e) {
+		// CTRL is not being pressed, return
+		if ((e.getModifiers() & KeyEvent.CTRL_MASK) == 0) {
+			return;
+		}
+		
+		switch (e.getKeyCode()) {
+			case KeyEvent.VK_S:
+				save();
+				break;
+			case KeyEvent.VK_C:
+				addClass();
+				break;
+			case KeyEvent.VK_R:
+				remove();
+				break;
+			case KeyEvent.VK_I:
+				addInput();
+				break;
+			case KeyEvent.VK_O:
+				addOutput();
+				break;
+		}
+		
+	}
+
+	
+	private void save() {
+		FileSaveAs action = new FileSaveAs(panel);
+		if (action.canPerformAction()) {
+			action.performAction();
+		}
+	}
+	
+	private void remove() {
+		RemovePaintComponent action = new RemovePaintComponent(panel);
+		if (action.canPerformAction()) {
+			action.performAction();
+		}
+	}
+	
+	private void addInput() {
+		AddDataInputBoxAction action = new AddDataInputBoxAction(panel);
+		if (action.canPerformAction()) {
+			action.performAction();
+		}
+	}
+	
+	private void addOutput() {
+		AddDataDisplayBoxAction action = new AddDataDisplayBoxAction(panel);
+		if (action.canPerformAction()) {
+			action.performAction();
+		}
+	}
+	
+	private void addClass() {
+		AddLazyJavaClassAction action = new AddLazyJavaClassAction(panel);
+		if (action.canPerformAction()) {
+			action.performAction();
+		}
+	}
+	
+}