Add comment for Paint Objects, Add Data Input Box

Author: UltimatePea

bin/.gitignore

@@ -0,0 +1,6 @@
+/actions/
+/icons/
+/paintcomponents/
+/painttools/
+/settings/
+/ui/

src/actions/InputDataForDataInputBoxAction.java

@@ -0,0 +1,40 @@
+package actions;
+
+import java.util.ArrayList;
+
+import javax.swing.JOptionPane;
+
+import paintcomponents.DataInputTextfieldPaintComponent;
+import paintcomponents.PaintComponent;
+import ui.PaintPanel;
+
+public class InputDataForDataInputBoxAction extends PaintAction {
+
+	public InputDataForDataInputBoxAction(PaintPanel panel) {
+		super(panel);
+	}
+
+	@Override
+	public boolean canPerformAction() {
+		ArrayList<PaintComponent> comps = panel.getSelectTool().getSelectedComponents();
+		if(comps.size()!= 1) return false;
+		if(comps.get(0) instanceof DataInputTextfieldPaintComponent){
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public void performAction() {
+		DataInputTextfieldPaintComponent inputComp = (DataInputTextfieldPaintComponent) panel.getSelectTool().getSelectedComponents().get(0);
+		String s = JOptionPane.showInputDialog("Please specify the message to push to the data input");
+		inputComp.inputData(s);
+		panel.repaint();
+	}
+
+	@Override
+	public String locationString() {
+		return "Input/Input into Data Panel";
+	}
+
+}

src/actions/menu/ActionsMenuBar.java

@@ -11,6 +11,7 @@
 import actions.AddTextBoxAction;
 import actions.ConstructLineSegmentAction;
 import actions.GeneratePolygonSourceJava;
+import actions.InputDataForDataInputBoxAction;
 import actions.PaintAction;
 import painttools.tools.SelectionToolListener;
 import ui.PaintPanel;
@@ -22,6 +23,7 @@ public ActionsMenuBar(PaintPanel panel){
 		addAction(new ConstructLineSegmentAction(panel));
 		addAction(new AddTextBoxAction(panel));
 		addAction(new AddDataInputBoxAction(panel));
+		addAction(new InputDataForDataInputBoxAction(panel));
 
 	}
 

src/paintcomponents/DataInputTextfieldPaintComponent.java

@@ -1,12 +1,15 @@
 package paintcomponents;
 
+import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 
 import settings.Defaults;
 
 public class DataInputTextfieldPaintComponent extends TextPaintComponent {
 
+	private static final int HORIZONTAL_OFFSET = 10;
 	DataFromPoint<String> fromPoint;
 	Color boundColor;
 	Color selectedColor;
@@ -24,21 +27,35 @@ public DataInputTextfieldPaintComponent(String displayingText, int x,
 
 	@Override
 	protected void paintNotSelected(Graphics g) {
-		super.paintNotSelected(g);
 		g.setColor(boundColor);
+		((Graphics2D)g).setStroke(new BasicStroke(1));
+		super.paintNotSelected(g);
+		updateFromPointPosition();
 		g.drawRect(getX(), getY(), (int)this.bounds.getWidth(), (int)this.bounds.getHeight());
 		fromPoint.paintNotSelected(g);
 
 	}
+	
 
 	@Override
 	protected void paintSelected(Graphics g) {
-		super.paintSelected(g);;
+		((Graphics2D)g).setStroke(new BasicStroke(1));
 		g.setColor(selectedColor);
+		super.paintSelected(g);;
+		updateFromPointPosition();
 		g.drawRect(getX(), getY(), (int)this.bounds.getWidth(), (int)this.bounds.getHeight());
 		fromPoint.paintSelected(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.
+	 */
+	private void updateFromPointPosition(){
+		this.fromPoint.setX((int) (getX() + this.bounds.getWidth() + HORIZONTAL_OFFSET));
+		this.fromPoint.setY((int) (getY() + this.bounds.getHeight() / 2));
+	}
+
 	@Override
 	public void translate(int i, int j) {
 		super.translate(i, j);
@@ -50,4 +67,9 @@ public boolean contains(int x, int y) {
 
 		return fromPoint.contains(x, y) || super.contains(x, y);
 	}
+
+	public void inputData(String s) {
+		fromPoint.offer(s);
+		this.setDisplayingText(s);
+	}
 }

src/paintcomponents/PaintComponent.java

@@ -42,6 +42,10 @@ public PaintComponent(int x, int y) {
 		this.y = y;
 	}
 
+	/**
+	 * Paints this component using a graphics object
+	 * @param g
+	 */
 	public void paint(Graphics g){
 		if(selected){
 			paintSelected(g);
@@ -51,23 +55,45 @@ public void paint(Graphics g){
 
 	}
 
+	/**
+	 * Paint the non-select version of this paint object
+	 * @param g
+	 */
 	protected abstract void paintNotSelected(Graphics g) ;
 
 
+	/**
+	 * Paints the selected version of this paint object
+	 * @param g
+	 */
 	protected abstract void paintSelected(Graphics g) ;
 
 
+	/**
+	 * Set the state of this object to be selected state
+	 */
 	public void select(){
 		selected = true;
 	}
+	
+	/**
+	 * Set the state of this object to be unselected
+	 */
 	public void deselect(){
 		selected = false;
 	}
 
+	/**
+	 * toggle the selection status of this paintable object
+	 */
 	public void toggleSelect() {
 		selected = !selected;
 	}
 
+	/**
+	 * Check if this object is selected
+	 * @return 
+	 */
 	public boolean isSelected(){
 		return selected;
 	}

src/paintcomponents/TextPaintComponent.java

@@ -42,10 +42,15 @@ protected void paintNotSelected(Graphics g) {
 		//draw string starts from bottom left corner, shift to top left
 		g.drawString(displayingText, getX(), (int) (getY() + bounds.getHeight()));
 	}
+	//IMPORTANT :: THIS COMPONENT IS SHIFTED DOWN, WHICH CAUSES PROBLEMS. WHEN FIXING COORDINATES, 
+	//WE SHOULD COME UP WITH A COMMON SOLUTION
 
 	@Override
 	protected void paintSelected(Graphics g) {
-		paintNotSelected(g);
+		bounds = ((Graphics2D)g).getFontMetrics().getStringBounds(displayingText,g); 
+
+		//draw string starts from bottom left corner, shift to top left
+		g.drawString(displayingText, getX(), (int) (getY() + bounds.getHeight()));
 
 	}