Merge pull request #92 from UCSDOalads/CZYBranch

add default selection of DataText // (input box created by user)

Author: chenggong03

src/actions/AddDataInputBoxAction.java

@@ -20,6 +20,12 @@ public boolean canPerformAction() {
 	@Override
 	public void performAction() {
 		DataInputTextfieldPaintComponent comp = new DataInputTextfieldPaintComponent("Data Input", panel.getWidth() /2, panel.getHeight()/2);
+		
+		// auto-select the component just created by the user
+		if (panel.getSelectTool() != null) {
+		    panel.getSelectTool().clearSelection();
+		    panel.getSelectTool().selectComponent(comp);
+		}
 		panel.addPaintComponent(comp);
 
 

src/paintcomponents/data/DataTextIOPaintComponent.java

@@ -168,8 +168,11 @@ public boolean contains(int x, int y) {
 
 	@Override
 	public void select(SelectTool selectTool) {
-		int x = selectTool.getLastMouseEvent().getX();
-		int y = selectTool.getLastMouseEvent().getY();
+		int x = this.getX() + HORIZONTAL_OFFSET, y = this.getY();
+		if (selectTool.getLastMouseEvent() != null) {
+		    x = selectTool.getLastMouseEvent().getX();
+            	    y = selectTool.getLastMouseEvent().getY();
+		}
 		// try to select every from and toPoints
 		for (DataFromPointInfo dataFromPointInfo : fromPoints) {
 			DataFromPoint fromPoint = dataFromPointInfo.fromPoint;
@@ -190,9 +193,11 @@ public void select(SelectTool selectTool) {
 
 	@Override
 	public void deselect(SelectTool selectTool) {
-		int x = selectTool.getLastMouseEvent().getX();
-		int y = selectTool.getLastMouseEvent().getY();
-
+		int x = this.getX() + HORIZONTAL_OFFSET, y = this.getY();
+		if (selectTool.getLastMouseEvent() != null) {
+		    x = selectTool.getLastMouseEvent().getX();
+	            y = selectTool.getLastMouseEvent().getY();
+		}
 		// try to deselect every from and toPoints
 		for (DataFromPointInfo dataFromPointInfo : fromPoints) {
 			DataFromPoint fromPoint = dataFromPointInfo.fromPoint;