re design history UI and undoRedoDialog

Author: kaijiec

images/addCursor.png

@@ -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();
+	}
 
 }

images/redo.png

@@ -0,0 +1,33 @@
+package buttons;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+
+public class CustomJButton extends JButton{
+
+	private String buttonTitle;
+	
+	public CustomJButton(String title){
+		buttonTitle = title;
+		setOpaque(false);
+		setFocusPainted(false);
+		setBorderPainted(false);
+	}
+	public void setCustomImageIcon(ImageIcon i){
+		setIcon(i);
+		setText("");
+		
+	}
+	
+	public void setButtonTitle(String title){
+		buttonTitle = title;
+	}
+	
+	public String getButtonTitle(){
+		return buttonTitle;
+	}
+
+}

images/undo.png

@@ -8,7 +8,7 @@
 import javax.swing.JToggleButton;
 
 public class ToolButton extends JToggleButton {
-	Dimension d = new Dimension(60,60);
+	Dimension d = new Dimension(40,40);
 
 	public ToolButton(String str){
 		super(str);
@@ -20,7 +20,7 @@ public ToolButton(){
 		setOpaque(false);
 		setFocusPainted(false);
 		setBorderPainted(false);
-		setButtonSize(new Dimension(60,60));
+		setButtonSize(d);
 	}
 
 

src/actions/edit/undoredo/SharedUndoRedoActionManager.java

@@ -9,9 +9,19 @@
 public interface ActionToolsInterface extends PaintToolsInterface, ActionListener {
 
 	/**
-	 * If you implements add paint actions, 
-	 * 	1. make sure override the actionPeformed method, to define the actions when
+	 *  If you implement add paint action tools:
+	 *  
+	 * 	1. make sure override the actionPeformed method to define actions when
 	 * 	   button is clicked. 
 	 * 
+	 * 	2. modify mouseClicked method to defined actions to perform when click
+	 * 	   on paintPanel
+	 * 
+	 *  3. you can call setX and setY to set the starting point for paintComponent
+	 *  
+	 *  4. you may need to call createButton in constructor to create a button for
+	 *     this tool, and you can set icons for button in createButton.
+	 * 
+	 *  
 	 */
 }

src/buttons/CustomJButton.java

@@ -3,8 +3,6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
 
-import javax.swing.ImageIcon;
-
 import actions.AddLazyJavaClassAction;
 import buttons.ToolButton;
 import ui.PaintPanel;
@@ -27,6 +25,9 @@ public AddClassTool(PaintPanel panel) {
 	public void start(PaintPanel panel) {
 	}
 
+	/**
+	 * create a toolButton for this tool, and set icons
+	 */
 	@Override
 	public void createButton() {
 		// TODO Auto-generated method stub
@@ -48,11 +49,15 @@ public void reset() {
 
 	}
 
+	/**
+	 * when mouse click paintPanel, add class dialog will pop up, and a class
+	 * component will be added to where mouse was clicked
+	 */
 	@Override
 	public void mouseClicked(MouseEvent e) {
-		// TODO Auto-generated method stub
 		AddLazyJavaClassAction action = new AddLazyJavaClassAction(panel);
 		if (action.canPerformAction()) {
+			// set the starting point for class component
 			action.setXY(e.getX(), e.getY());
 			action.performAction();
 		}
@@ -96,6 +101,9 @@ public void mouseMoved(MouseEvent e) {
 
 	}
 
+	/**
+	 * change the cursor when add button is clicked
+	 */
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		panel.setNewCursor (CustomCursors.addComponentcursor());

src/buttons/ToolButton.java

@@ -17,15 +17,15 @@ public class AddInputBoxTool implements ActionToolsInterface {
 	public AddInputBoxTool(PaintPanel panel) {
 		this.panel = panel;
 		createButton();
-
-
 	}
 
 	@Override
 	public void start(PaintPanel panel) {
 	}
 
-	
+	/**
+	 * create a toolButton for this tool, and set icons
+	 */
 	@Override
 	public void createButton() {
 		// TODO Auto-generated method stub
@@ -46,11 +46,17 @@ public void reset() {
 
 	}
 
+	
+	/**
+	 * when mouse click paintPanel, a input box will be added to 
+	 * where mouse was clicked
+	 */
 	@Override
 	public void mouseClicked(MouseEvent e) {
 
 		AddDataInputBoxAction action = new AddDataInputBoxAction(panel);
 		if(action.canPerformAction()){
+			//set starting point for paint component
 			action.setXY(e.getX(), e.getY());
 			action.performAction();
 			action.setDefaultXY();
@@ -95,6 +101,9 @@ public void mouseMoved(MouseEvent e) {
 
 	}
 
+	/**
+	 * change the cursor when add button is clicked
+	 */
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		// TODO Auto-generated method stub

src/painttools/tools/ActionToolsInterface.java

@@ -3,8 +3,6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
 
-import javax.swing.ImageIcon;
-
 import actions.AddDataDisplayBoxAction;
 import buttons.ToolButton;
 import ui.PaintPanel;
@@ -26,6 +24,10 @@ public AddOutputBoxTool(PaintPanel panel) {
 	@Override
 	public void start(PaintPanel panel) {
 	}
+	
+	/**
+	 * create a toolButton for this tool, and set icons
+	 */
 	@Override
 	public void createButton() {
 		// TODO Auto-generated method stub
@@ -45,11 +47,17 @@ public void reset() {
 
 	}
 
+	
+	/**
+	 * when mouse click paintPanel, a display box will be added to 
+	 * where mouse was clicked
+	 */
 	@Override
 	public void mouseClicked(MouseEvent e) {
 		// TODO Auto-generated method stub
 		AddDataDisplayBoxAction action = new AddDataDisplayBoxAction(panel);
 		if (action.canPerformAction()) {
+			// set the starting point for paint component
 			action.setXY(e.getX(), e.getY());
 			action.performAction();
 			action.setDefaultXY();
@@ -94,6 +102,9 @@ public void mouseMoved(MouseEvent e) {
 
 	}
 
+	/**
+	 * change the cursor when add button is clicked
+	 */
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		panel.setNewCursor (CustomCursors.addComponentcursor());