Add Select Tool's Last Event, Update DataInputTextfieldPaintComponent to override Select method to provide point selection behaviour, Bug: the poitn cannot be deselected

Author: UltimatePea

src/paintcomponents/DataInputTextfieldPaintComponent.java

@@ -1,37 +1,35 @@
 package paintcomponents;
 
-import java.awt.BasicStroke;
-import java.awt.Color;
 import java.awt.Graphics;
-import java.awt.Graphics2D;
 
-import settings.Defaults;
+import painttools.tools.SelectTool;
 
 /**
  * A data text with a point on the right
+ * 
  * @author chenzb
  *
  */
-public class DataInputTextfieldPaintComponent extends DataTextPaintComponent implements DataFromPointDataProvider<String> {
-
+public class DataInputTextfieldPaintComponent extends DataTextPaintComponent
+		implements DataFromPointDataProvider<String> {
 
 	private static final int HORIZONTAL_OFFSET = 10;
 	private DataFromPoint<String> fromPoint;
-	
+
 	public DataInputTextfieldPaintComponent(String displayingText, int x,
 			int y) {
 		super(displayingText, x, y);
 		this.fromPoint = new DataFromPoint<>(x, y);
 		fromPoint.setProvider(this);
 	}
-	
+
 	@Override
 	protected void paintSelected(Graphics g) {
 		super.paintSelected(g);
 		updateFromPointPosition();
 		fromPoint.paint(g);
 	}
-	
+
 	@Override
 	protected void paintNotSelected(Graphics g) {
 		super.paintNotSelected(g);
@@ -40,11 +38,13 @@ protected void paintNotSelected(Graphics g) {
 	}
 
 	/**
-	 * This method will use the protected bounds, which will be updated in super.paint[Not]Selected.
-	 * Make sure you've already invoked super's paintNotSelectedMethod before invoking this one.
+	 * This method will use the protected bounds, which will be updated in
+	 * super.paint[Not]Selected. Make sure you've already invoked super's
+	 * paintNotSelectedMethod before invoking this one.
 	 */
-	private void updateFromPointPosition(){
-		this.fromPoint.setX((int) (getX() + this.bounds.getWidth() + HORIZONTAL_OFFSET));
+	private void updateFromPointPosition() {
+		this.fromPoint.setX(
+				(int) (getX() + this.bounds.getWidth() + HORIZONTAL_OFFSET));
 		this.fromPoint.setY((int) (getY() + this.bounds.getHeight() / 2));
 	}
 
@@ -53,7 +53,7 @@ public void translate(int i, int j) {
 		super.translate(i, j);
 		this.fromPoint.translate(i, j);
 	}
-	
+
 	@Override
 	public boolean contains(int x, int y) {
 
@@ -75,5 +75,28 @@ public boolean canProvideInformationToDataFromPoint(
 			DataFromPoint<String> dataFromPoint) {
 		return displayingText == null;
 	}
-	
+
+	@Override
+	public void select(SelectTool selectTool) {
+		int x = selectTool.getLastMouseEvent().getX();
+		int y = selectTool.getLastMouseEvent().getY();
+		if (fromPoint.contains(x, y)) {
+			fromPoint.select(selectTool);
+		} else {
+			super.select(selectTool);
+		}
+
+	}
+
+	@Override
+	public void deselect(SelectTool selectTool) {
+		int x = selectTool.getLastMouseEvent().getX();
+		int y = selectTool.getLastMouseEvent().getY();
+		if (fromPoint.contains(x, y)) {
+			fromPoint.deselect(selectTool);
+		} else {
+			super.deselect(selectTool);
+		}
+	}
+
 }

src/paintcomponents/PaintComponent.java

@@ -8,8 +8,11 @@
 /**
  * Abstracts the behavior of a paint component.
  * 
- * Override translate method if you want to customize tranlation. Override
- * select and deselect method to perform additional selections.
+ * To add functionality to translation: Override translate method if you want to
+ * customize tranlation.
+ * 
+ * To add functionality to selection: Override select and deselect method to
+ * perform additional selections.
  * 
  * 
  * You should generally not override paint, toggleSelect as the default
@@ -92,6 +95,7 @@ public void paint(Graphics g) {
 
 	/**
 	 * Set the state of this object to be selected state
+	 * If select tool is not null, update select tools's selection list to contain this paint component
 	 * 
 	 * @param selectTool
 	 *            TODO
@@ -105,6 +109,8 @@ public void select(SelectTool selectTool) {
 	/**
 	 * Set the state of this object to be unselected
 	 * 
+	 * If the select tool is not null,  remove this paint component from the tool's selection list
+	 * 
 	 * @param selectTool
 	 *            TODO
 	 */

src/painttools/tools/SelectTool.java

@@ -18,6 +18,15 @@ public class SelectTool extends PaintTool {
 
 	private ArrayList<PaintComponent> selectedComponents;
 	private ArrayList<SelectionToolListener> listeners;
+	
+	private MouseEvent lastMouseEvent;
+
+	/**
+	 * @return the lastMouseEvent
+	 */
+	public MouseEvent getLastMouseEvent() {
+		return lastMouseEvent;
+	}
 
 	/**
 	 * adds a selection listener
@@ -95,9 +104,11 @@ public void clearSelection() {
 
 	@Override
 	public void mousePressed(MouseEvent e) {
+		lastMouseEvent = e;
 		// TODO Auto-generated method stub
 		// select or deselect component under cursor on mouse clicked
 
+
 		PaintComponent comp = panel.componentUnderPoint(e.getX(), e.getY());
 		if (comp != null) {
 			if (comp.isSelected()) {
@@ -123,6 +134,7 @@ public void mousePressed(MouseEvent e) {
 	@Override
 	public void mouseReleased(MouseEvent e) {
 		// select or deselect component under cursor on mouse clicked
+		lastMouseEvent = e;
 
 		PaintComponent comp = panel.componentUnderPoint(e.getX(), e.getY());
 		if (comp != null) {
@@ -163,6 +175,7 @@ public void mouseExited(MouseEvent e) {
 	@Override
 	public void mouseDragged(MouseEvent e) {
 
+		lastMouseEvent = e;
 		// do nothing if dragged empty
 		// TODO GROUP SELECTION WHEN CANNOT DRAG
 		if (!canDrag)
@@ -203,6 +216,7 @@ public void mouseDragged(MouseEvent e) {
 	@Override
 	public void mouseMoved(MouseEvent e) {
 
+		lastMouseEvent = e;
 		// shows a left arrow if cursor hits something
 		PaintComponent comp = panel.componentUnderPoint(e.getX(), e.getY());
 		if (comp != null) {