Merge branch 'develop' into addIanKo

Author: chenggong03

?/.java/fonts/1.8.0_121/fcinfo-1-its-cseb260-26.ucsd.edu-null-null-en.properties

@@ -0,0 +1,57 @@
+package actions;
+
+import ui.PaintPanel;
+
+public class AddComponentActions extends MenuBarPaintAction{
+
+	protected int x;
+	protected int y;
+	
+	public AddComponentActions(PaintPanel panel) {
+		super(panel);
+		
+		setDefaultXY();
+	}
+
+	/**
+	 * set the default point to the middle of paint panel
+	 */
+	public void setDefaultXY(){
+		x = panel.getWidth()/2;
+		y = panel.getHeight()/2;
+		
+	}
+	
+	
+	public void setX(int newX){
+		x = newX;
+	}
+	
+	public void setY(int newY){
+		y = newY;
+	}
+	
+	public void setXY(int newX, int newY){
+		x = newX;
+		y = newY;
+	}
+	
+	@Override
+	public boolean canPerformAction() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void performAction() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public String locationString() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}

images/addCursor.png

@@ -12,7 +12,7 @@
 import ui.general.InputManager;
 import ui.general.InputManagerDelegate;
 
-public class AddDataDisplayBoxAction extends MenuBarPaintAction {
+public class AddDataDisplayBoxAction extends AddComponentActions {
 
 	public AddDataDisplayBoxAction(PaintPanel panel) {
 		super(panel);
@@ -30,10 +30,9 @@ public void performAction() {
 		AddDataDisplayBoxGlobalAction associatedAction = (AddDataDisplayBoxGlobalAction) ActionName.ADD_DATA_DISPLAY_BOX
 				.getAssociatedAction();
 		associatedAction.setDisplayString("Data Display");
-		associatedAction.setX(panel.getWidth() / 2);
-		associatedAction.setY(panel.getHeight() / 2);
-		GlobalPaintActionExecuter.getSharedInstance().execute(associatedAction,
-				panel);
+		associatedAction.setX(x);
+		associatedAction.setY(y);
+		GlobalPaintActionExecuter.getSharedInstance().execute(associatedAction, panel);
 
 	}
 

images/redo.png

@@ -6,20 +6,22 @@
 import paintcomponents.data.DataInputTextfieldPaintComponent;
 import ui.PaintPanel;
 
-public class AddDataInputBoxAction extends MenuBarPaintAction {
+public class AddDataInputBoxAction extends AddComponentActions {
+
 
 	public AddDataInputBoxAction(PaintPanel panel) {
 		super(panel);
 	}
 
+	
 	@Override
 	public boolean canPerformAction() {
 		return true;
 	}
 
 	@Override
 	public void performAction() {
-		DataInputTextfieldPaintComponent comp = new DataInputTextfieldPaintComponent("Data Input", panel.getWidth() /2, panel.getHeight()/2);
+		DataInputTextfieldPaintComponent comp = new DataInputTextfieldPaintComponent("Data Input", x,y);
 
 		// auto-select the component just created by the user
 		if (panel.getSelectTool() != null) {

images/undo.png

@@ -8,7 +8,7 @@
 import actions.global.globalactions.AddLazyJavaClassGlobalAction;
 import actions.menu.ActionsMenuBarTitles;
 
-public class AddLazyJavaClassAction extends MenuBarPaintAction {
+public class AddLazyJavaClassAction extends AddComponentActions {
 
 	public AddLazyJavaClassAction(PaintPanel panel) {
 		super(panel);
@@ -29,10 +29,8 @@ public void didFinishInput(Class input) {
 				AddLazyJavaClassGlobalAction associatedAction = (AddLazyJavaClassGlobalAction) ActionName.ADD_LAZY_JAVA_CLASS_ACTION
 						.getAssociatedAction();
 				associatedAction.setClassToCreate(input);
-				associatedAction.setCoord(panel.getWidth() / 2,
-						panel.getHeight() / 2);
-				GlobalPaintActionExecuter.getSharedInstance().execute(
-						associatedAction, panel);
+				associatedAction.setCoord(x, y);
+				GlobalPaintActionExecuter.getSharedInstance().execute(associatedAction, panel);
 
 			}
 		});

src/actions/AddComponentActions.java

@@ -91,5 +91,19 @@ public Stack<UndoRedoableInterface> getUndoStack() {
 	public Stack<UndoRedoableInterface> getRedoStack() {
 		return redoStack;
 	}
+	
+	/**
+	 * return the last item in undoStack
+	 */
+	public UndoRedoableInterface undoPeek(){
+		return undoStack.peek();
+	}
+	
+	/**
+	 * return last item in redoStack
+	 */
+	public UndoRedoableInterface redoPeek(){
+		return redoStack.peek();
+	}
 
 }

src/actions/AddDataDisplayBoxAction.java

@@ -1,8 +1,8 @@
 package actions.edit.undoredo;
 
-import ui.helper.historyui.HistoryDataObject;
+import ui.helper.historyui.TableUIDataObject;
 
-public abstract class UndoRedoableInterface extends HistoryDataObject {
+public abstract class UndoRedoableInterface extends TableUIDataObject {
 
 	public abstract void undoAction();
 	public abstract void redoAction();