Merge pull request #128 from UCSDOalads/doubleClickPromptForDataInputBoxByAlex

Double click prompt for data input box by alex

Author: CVIllustrious

src/actions/InputDataForDataInputBoxAction.java

@@ -21,7 +21,7 @@ public InputDataForDataInputBoxAction(PaintPanel panel) {
 	public boolean canPerformAction() {
 		ArrayList<PaintComponent> comps = panel.getSelectTool().getSelectedComponents();
 		if(comps.size()!= 1) return false;
-		if(comps.get(0) instanceof DataInputTextfieldPaintComponent){
+		if (comps.get(0) instanceof DataInputTextfieldPaintComponent) {
 			return true;
 		}
 		return false;

src/painttools/tools/SelectTool.java

@@ -5,9 +5,11 @@
 
 import javax.swing.ImageIcon;
 
+import actions.InputDataForDataInputBoxAction;
 import buttons.ToolButton;
 import icons.LeftArrow;
 import paintcomponents.PaintComponent;
+import paintcomponents.data.DataInputTextfieldPaintComponent;
 import settings.Defaults;
 import ui.PaintPanel;
 
@@ -63,10 +65,17 @@ public void mouseClicked(MouseEvent e) {
 	 * @param comp
 	 */
 	public void selectComponent(PaintComponent comp) {
+		
 		comp.select(this);
+		
+		// update the components listening to select tool
 		for (SelectionToolListener selectionToolListener : listeners) {
 			selectionToolListener.selectionChanged();
 		}
+
+		// prompt data input if user double clicked on a selected data box
+		doubleClickAction(comp);
+
 		panel.repaint();
 	}
 
@@ -77,6 +86,11 @@ public void selectComponent(PaintComponent comp) {
 	 * @param comp
 	 */
 	public void deselectComponent(PaintComponent comp) {
+
+		// check if double clicked, if so perform the action on the data box
+		doubleClickAction(comp);
+
+		// then deselect the component
 		comp.deselect(this);
 		for (SelectionToolListener selectionToolListener : listeners) {
 			selectionToolListener.selectionChanged();
@@ -280,4 +294,22 @@ public void addSelectedComponent(PaintComponent pc){
 	public void removeSelectedComponent(PaintComponent pc){
 		selectedComponents.remove(pc);
 	}
+
+	/**
+	 * Check if user double clicked a data box and it will prompt user to type
+	 * data if double clicked on a selected or de-selected data box
+	 * 
+	 * @param comp
+	 */
+	private void doubleClickAction(PaintComponent comp) {
+
+		// data input box prompt right after a double click on the box
+		if (comp instanceof DataInputTextfieldPaintComponent && getLastMouseEvent().getClickCount() == 2
+				&& !getLastMouseEvent().isConsumed()) {
+
+			InputDataForDataInputBoxAction newAction = new InputDataForDataInputBoxAction(panel);
+			newAction.performAction();
+			getLastMouseEvent().consume();
+		}
+	}
 }