Merge branch 'develop' of https://github.com/UCSDOalads/JavaSketchPad into addGlobalFileActions

Author: lhwlyd

src/actions/AddDataDisplayBoxAction.java

@@ -20,6 +20,7 @@ public AddDataDisplayBoxAction(PaintPanel panel) {
 
 	@Override
 	public boolean canPerformAction() {
+		
 		return true;
 	}
 

src/actions/AddDataInputBoxAction.java

@@ -28,6 +28,7 @@ public void performAction() {
 		}
 		panel.addPaintComponent(comp);
 
+	    
 
 		//push action to the manager
 		SharedUndoRedoActionManager.getSharedInstance().pushUndoableAction(new UndoRedoableInterface() {

src/actions/UpdateDataDisplayBoxAction.java

@@ -22,9 +22,10 @@ public UpdateDataDisplayBoxAction(PaintPanel panel) {
 
 	@Override
 	public boolean canPerformAction() {
+		
 		if(panel.getSelectTool().getSelectedComponents().size() == 1){
 			if(panel.getSelectTool().getSelectedComponents().get(0) instanceof DataDisplayPaintComponent){
-				return true;
+				return ((DataDisplayPaintComponent) panel.getSelectTool().getSelectedComponents().get(0)).canUpdate();
 			}
 		}
 		return false;

src/actions/global/globalactions/AddDataDisplayBoxGlobalAction.java

@@ -15,6 +15,7 @@ public class AddDataDisplayBoxGlobalAction extends GlobalPaintAction {
 	private String dataDisplay;
 	private int x;
 	private int y;
+	private DataDisplayPaintComponent comp;
 
 	public void setDisplayString(String dataDisplay) {
 		this.dataDisplay = dataDisplay;
@@ -38,8 +39,12 @@ public void setY(int y) {
 
 	@Override
 	protected void execute(PaintPanel panel) {
-		DataDisplayPaintComponent comp = new DataDisplayPaintComponent(
+		comp = new DataDisplayPaintComponent(
 				dataDisplay, x, y);
+		if (panel.getSelectTool() != null) {
+		    panel.getSelectTool().clearSelection();
+		    panel.getSelectTool().selectComponent(comp);
+		}
 		panel.addPaintComponent(comp);
 
 		// push action to manager
@@ -71,5 +76,9 @@ protected String commandDescription() {
 				});
 		panel.repaint();
 	}
+	
+	public DataDisplayPaintComponent getComponent() {
+		return comp;
+	}
 
 }

src/icons/LeftArrow.java

@@ -94,15 +94,15 @@ public static Polygon getPolygon(){
 
 		Polygon p = new Polygon();
 
-		p.addPoint(8, 0);
-		p.addPoint(0, 9);
-		p.addPoint(8, 20);
-		p.addPoint(8, 17);
-		p.addPoint(8, 14);
-		p.addPoint(40, 15);
-		p.addPoint(40, 8);
-		p.addPoint(8, 7);
-		p.addPoint(8, 1);
+		p.addPoint(8, 5);
+		p.addPoint(0, 14);
+		p.addPoint(8, 25);
+		p.addPoint(8, 22);
+		p.addPoint(8, 19);
+		p.addPoint(40, 20);
+		p.addPoint(40, 13);
+		p.addPoint(8, 12);
+		p.addPoint(8, 6);
 
 
 		return p;

src/paintcomponents/data/DataDisplayPaintComponent.java

@@ -42,6 +42,17 @@ public void updateDisplayText() throws NoSuchElementException, NoConnectingLineS
 		}
 	}
 
+	public boolean canUpdate(){
+		try {
+			Object data = getToPoints().get(0).fetchData();
+			if(data instanceof String){
+				return true;
+			}
+		} catch (Exception e) {
+			return false;
+		}
+		return false;
+	}
 	@Override
 	public void saveToElement(Element rootElement, Document doc) {
 		super.saveToElement(rootElement, doc);

src/painttools/tools/SelectTool.java

@@ -246,7 +246,6 @@ public void mouseMoved(MouseEvent e) {
 	@Override
 	public void start(PaintPanel panel) {
 		this.panel = panel;
-
 	}
 
 	@Override