Add Rectangle Class, Modify DataInputComponent Class, Add Defaults for Rectangle

Author: UltimatePea

src/paintcomponents/DataInputTextfieldPaintComponent.java

@@ -10,42 +10,50 @@
 public class DataInputTextfieldPaintComponent extends TextPaintComponent {
 
 	private static final int HORIZONTAL_OFFSET = 10;
-	DataFromPoint<String> fromPoint;
-	Color boundColor;
-	Color selectedColor;
+	private DataFromPoint<String> fromPoint;
+	private RectanglePaintComponent rect;
+	private Color defaultColor;
+	private Color selectedColor;
 
 
 	public DataInputTextfieldPaintComponent(String displayingText, int x,
 			int y) {
 		super(displayingText, x, y);
 		fromPoint = new DataFromPoint<>(x - 50, y);
-		boundColor = Defaults.sharedDefaults().defaultColorForDataInputTextfield();
+		defaultColor = Defaults.sharedDefaults().defaultColorForDataInputTextfield();
 		selectedColor = Defaults.sharedDefaults().defaultColorForSelectedDataInputTextfield();
 	}
 
 
 
 	@Override
 	protected void paintNotSelected(Graphics g) {
-		g.setColor(boundColor);
+		g.setColor(defaultColor);
 		((Graphics2D)g).setStroke(new BasicStroke(1));
 		super.paintNotSelected(g);
 		updateFromPointPosition();
-		g.drawRect(getX(), getY(), (int)this.bounds.getWidth(), (int)this.bounds.getHeight());
+		updateAndPaintBoudingRectangle(g);
 		fromPoint.paintNotSelected(g);
 
 	}
 
 
 	@Override
 	protected void paintSelected(Graphics g) {
-		((Graphics2D)g).setStroke(new BasicStroke(1));
 		g.setColor(selectedColor);
+		((Graphics2D)g).setStroke(new BasicStroke(1));
 		super.paintSelected(g);;
 		updateFromPointPosition();
-		g.drawRect(getX(), getY(), (int)this.bounds.getWidth(), (int)this.bounds.getHeight());
+		updateAndPaintBoudingRectangle(g);
 		fromPoint.paintSelected(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.paint(g);
+	}
 
 	/**
 	 * This method will use the protected bounds, which will be updated in super.paint[Not]Selected.
@@ -72,4 +80,5 @@ public void inputData(String s) {
 		fromPoint.offer(s);
 		this.setDisplayingText(s);
 	}
+	
 }

src/paintcomponents/RectanglePaintComponent.java

@@ -0,0 +1,93 @@
+/**
+ * 
+ */
+package paintcomponents;
+
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+
+import settings.Defaults;
+
+/**
+ * @author chenzb
+ *
+ */
+public class RectanglePaintComponent extends PaintComponent {
+	//TODO Maybe delegate this class to java.awt.Rectangle????
+
+	private int width;
+	private int height;
+	
+	private Color nonSelectColor;
+	private Color selectColor;
+
+	/**
+	 * @return the width
+	 */
+	public int getWidth() {
+		return width;
+	}
+
+	/**
+	 * @param width the width to set
+	 */
+	public void setWidth(int width) {
+		this.width = width;
+	}
+
+	/**
+	 * @return the height
+	 */
+	public int getHeight() {
+		return height;
+	}
+
+	/**
+	 * @param height the height to set
+	 */
+	public void setHeight(int height) {
+		this.height = height;
+	}
+
+	/**
+	 * @param x
+	 * @param y
+	 */
+	public RectanglePaintComponent(int x, int y, int width, int height) {
+		super(x, y);
+		this.width = width;
+		this.height = height;
+		this.nonSelectColor = Defaults.sharedDefaults().defaultColorForRectanglePaintComponent();
+		this.selectColor = Defaults.sharedDefaults().defaultColorForSelectedRectanglePaintComponent();
+	}
+
+	/* (non-Javadoc)
+	 * @see paintcomponents.PaintComponent#paintNotSelected(java.awt.Graphics)
+	 */
+	@Override
+	protected void paintNotSelected(Graphics g) {
+		g.setColor(nonSelectColor);
+		g.drawRect(getX(), getY(), width, height);
+
+	}
+
+	/* (non-Javadoc)
+	 * @see paintcomponents.PaintComponent#paintSelected(java.awt.Graphics)
+	 */
+	@Override
+	protected void paintSelected(Graphics g) {
+		g.setColor(selectColor);
+		g.drawRect(getX(), getY(), width, height);
+
+	}
+
+	/* (non-Javadoc)
+	 * @see paintcomponents.PaintComponent#contains(int, int)
+	 */
+	@Override
+	public boolean contains(int x2, int y2) {
+		return new Rectangle(getX(), getY(), getWidth(), getHeight()).contains(x2, y2);
+	}
+
+}

src/settings/Defaults.java

@@ -62,4 +62,11 @@ public Color defaultColorForDataInputTextfield() {
 	public Color defaultColorForSelectedDataInputTextfield(){
 		return DATA_INPUT_TEXTFIELD_SELECTED_COLOR;
 	}
+	public Color defaultColorForRectanglePaintComponent() {
+		return DATA_INPUT_TEXTFIELD_COLOR;
+	}
+	
+	public Color defaultColorForSelectedRectanglePaintComponent(){
+		return DATA_INPUT_TEXTFIELD_SELECTED_COLOR;
+	}
 }