Redefine PaintComponent's select method, PaintComponent are now responsible for adding to and removing from the SelectTool's list of selected components

Author: UltimatePea

src/paintcomponents/DataInputTextfieldPaintComponent.java

@@ -7,6 +7,11 @@
 
 import settings.Defaults;
 
+/**
+ * A data text with a point on the right
+ * @author chenzb
+ *
+ */
 public class DataInputTextfieldPaintComponent extends DataTextPaintComponent {
 
 

src/paintcomponents/DataTextPaintComponent.java

@@ -5,6 +5,7 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 
+import painttools.tools.SelectTool;
 import settings.Defaults;
 
 /**
@@ -16,14 +17,15 @@
 public class DataTextPaintComponent extends TextPaintComponent {
 
 
-private RectanglePaintComponent rect;
+	private RectanglePaintComponent rect;
 	private Color defaultColor;
 	private Color selectedColor;
 
-public DataTextPaintComponent(String displayingText, int x, int y) {
+	public DataTextPaintComponent(String displayingText, int x, int y) {
 		super(displayingText, x, y);
 		defaultColor = Defaults.sharedDefaults().defaultColorForDataInputTextfield();
 		selectedColor = Defaults.sharedDefaults().defaultColorForSelectedDataInputTextfield();
+		rect = new RectanglePaintComponent(x, y, 0, 0);
 	}
 
 
@@ -49,10 +51,31 @@ protected void paintSelected(Graphics g) {
 	}
 
 	private void updateAndPaintBoudingRectangle(Graphics g){
-		rect = new RectanglePaintComponent(getX(), getY(), (int)this.bounds.getWidth(), (int)this.bounds.getHeight());
-		//select rectangle according to current select status
-		if(isSelected())rect.select(); else rect.deselect();
+		rect.setWidth((int) bounds.getWidth());
+		rect.setHeight((int) bounds.getHeight());
 		rect.paint(g);
 	}
+	
+	@Override
+	public void translate(int i, int j) {
+		super.translate(i, j);
+		this.rect.translate(i, j);
+	}
+	
+	@Override
+	public void select(SelectTool selectTool) {
+		super.select(selectTool);
+		//pass in null to prevent current selection from being modified
+		//only causes changes in apperance
+		rect.select(null);
+	}
 
+	@Override
+	public void deselect(SelectTool selectTool) {
+		// TODO Auto-generated method stub
+		super.deselect(selectTool);
+		rect.deselect(null);
+	}
+	
+	
 }

src/paintcomponents/PaintComponent.java

@@ -1,9 +1,27 @@
 package paintcomponents;
+
 import java.awt.Graphics;
 import java.awt.Rectangle;
 
+import painttools.tools.SelectTool;
+
+/**
+ * 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.
+ * 
+ * 
+ * You should generally not override paint, toggleSelect as the default
+ * implementation delegates to other methods that you have to.
+ * 
+ * MAKE SURE YOU CALL SUPER when overriding non-abstract methods.
+ * 
+ * @author chenzb
+ *
+ */
 public abstract class PaintComponent {
-	
+
 	private int x;
 	private int y;
 	private boolean selected;
@@ -16,7 +34,8 @@ public int getX() {
 	}
 
 	/**
-	 * @param x the x to set
+	 * @param x
+	 *            the x to set
 	 */
 	public void setX(int x) {
 		this.x = x;
@@ -30,7 +49,8 @@ public int getY() {
 	}
 
 	/**
-	 * @param y the y to set
+	 * @param y
+	 *            the y to set
 	 */
 	public void setY(int y) {
 		this.y = y;
@@ -41,71 +61,88 @@ public PaintComponent(int x, int y) {
 		this.x = x;
 		this.y = y;
 	}
-	
+
 	/**
 	 * Paints this component using a graphics object
+	 * 
 	 * @param g
 	 */
-	public void paint(Graphics g){
-		if(selected){
+	public void paint(Graphics g) {
+		if (selected) {
 			paintSelected(g);
 		} else {
 			paintNotSelected(g);
 		}
-		
+
 	}
-		
+
 	/**
 	 * Paint the non-select version of this paint object
+	 * 
 	 * @param g
 	 */
-	protected abstract void paintNotSelected(Graphics g) ;
-		
+	protected abstract void paintNotSelected(Graphics g);
 
 	/**
 	 * Paints the selected version of this paint object
+	 * 
 	 * @param g
 	 */
-	protected abstract void paintSelected(Graphics g) ;
-		
+	protected abstract void paintSelected(Graphics g);
 
 	/**
 	 * Set the state of this object to be selected state
+	 * 
+	 * @param selectTool
+	 *            TODO
 	 */
-	public void select(){
+	public void select(SelectTool selectTool) {
 		selected = true;
+		if (selectTool != null)
+			selectTool.getSelectedComponents().add(this);
 	}
-	
+
 	/**
 	 * Set the state of this object to be unselected
+	 * 
+	 * @param selectTool
+	 *            TODO
 	 */
-	public void deselect(){
+	public void deselect(SelectTool selectTool) {
 		selected = false;
+		if (selectTool != null)
+			selectTool.getSelectedComponents().remove(this);
 	}
-	
+
 	/**
 	 * toggle the selection status of this paintable object
+	 * 
+	 * @param selectTool
+	 *            TODO
 	 */
-	public void toggleSelect() {
-		selected = !selected;
+	public void toggleSelect(SelectTool selectTool) {
+		if (isSelected()) {
+			deselect(selectTool);
+		} else {
+			select(selectTool);
+		}
 	}
-	
+
 	/**
 	 * Check if this object is selected
-	 * @return 
+	 * 
+	 * @return
 	 */
-	public boolean isSelected(){
+	public boolean isSelected() {
 		return selected;
 	}
 
 	public void translate(int i, int j) {
-		this.x+=i;
-		this.y+=j;
-		
-	}
-
+		this.x += i;
+		this.y += j;
 
-	public abstract boolean contains(int x2, int y2); 
+	}
 
+	public abstract boolean contains(int x2, int y2);
 
 }

src/painttools/tools/SelectTool.java

@@ -55,8 +55,7 @@ public void mouseClicked(MouseEvent e) {
 	 * @param comp
 	 */
 	public void selectComponent(PaintComponent comp) {
-		comp.select();
-		selectedComponents.add(comp);
+		comp.select(this);
 		for (SelectionToolListener selectionToolListener : listeners) {
 			selectionToolListener.selectionChanged();
 		}
@@ -70,8 +69,7 @@ public void selectComponent(PaintComponent comp) {
 	 * @param comp
 	 */
 	public void deselectComponent(PaintComponent comp) {
-		comp.deselect();
-		selectedComponents.remove(comp);
+		comp.deselect(this);
 		for (SelectionToolListener selectionToolListener : listeners) {
 			selectionToolListener.selectionChanged();
 		}
@@ -85,10 +83,9 @@ public void deselectComponent(PaintComponent comp) {
 	 */
 	public void clearSelection() {
 		// remove all selection
-		for (PaintComponent component : selectedComponents) {
-			component.deselect();
+		while(!selectedComponents.isEmpty()) {
+			selectedComponents.get(0).deselect(this);
 		}
-		selectedComponents.clear();
 
 		for (SelectionToolListener selectionToolListener : listeners) {
 			selectionToolListener.selectionChanged();