modified

Author: kaijiec

src/actions/ShowHistory.java

@@ -0,0 +1,36 @@
+package actions;
+
+import java.awt.Dimension;
+
+import ui.PaintPanel;
+import ui.helper.historyui.undoredoLog.UndoredoLog;
+
+public class ShowHistory extends PaintAction {
+	
+
+	public ShowHistory(PaintPanel panel) {
+		super(panel);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public boolean canPerformAction() {
+		// TODO Auto-generated method stub
+		return true;
+	}
+
+	@Override
+	public void performAction() {
+		// TODO Auto-generated method stub
+
+		UndoredoLog.sharedInstance().setVisible(true);
+		
+	}
+
+	@Override
+	public String locationString() {
+		// TODO Auto-generated method stub
+		return "View/Show/History";
+	}
+	
+}

src/actions/edit/undoredo/SharedUndoRedoActionManager.java

@@ -12,6 +12,7 @@ public class SharedUndoRedoActionManager {
 	private static SharedUndoRedoActionManager sharedInstance = new SharedUndoRedoActionManager();
 	private Stack<UndoRedoableInterface> undoStack;
 	private Stack<UndoRedoableInterface> redoStack;
+	private SharedUndoRedoActionManagerDelegate delegate;
 
 	/** Static instance method */
 	public static SharedUndoRedoActionManager getSharedInstance(){
@@ -31,12 +32,14 @@ public void undo() {
 		UndoRedoableInterface undoableAction = undoStack.pop();
 		undoableAction.undoAction();
 		redoStack.add(undoableAction);
+		delegate.didUndoAction(undoableAction);
 	}
 
 	public void redo() {
 		UndoRedoableInterface redoableAction = redoStack.pop();
 		redoableAction.redoAction();
 		undoStack.add(redoableAction);
+		delegate.didUndoAction(redoableAction);
 	}
 
 	public boolean canUndo() {
@@ -52,4 +55,12 @@ public void pushUndoableAction( UndoRedoableInterface undoredoableAction ) {
 		redoStack.clear();
 	}
 
+	public SharedUndoRedoActionManagerDelegate getDelegate() {
+		return delegate;
+	}
+
+	public void setDelegate(SharedUndoRedoActionManagerDelegate delegate) {
+		this.delegate = delegate;
+	}
+
 }

src/actions/edit/undoredo/SharedUndoRedoActionManagerDelegate.java

@@ -0,0 +1,7 @@
+package actions.edit.undoredo;
+
+public interface SharedUndoRedoActionManagerDelegate {
+	
+	public void didUndoAction(UndoRedoableInterface obj);
+	public void didRedoAction(UndoRedoableInterface obj);
+}

src/actions/edit/undoredo/UndoRedoableInterface.java

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

src/actions/menu/ActionsMenuBar.java

@@ -30,6 +30,7 @@
 import actions.PaintAction;
 import actions.RemoveAnnotationAction;
 import actions.RemovePaintComponent;
+import actions.ShowHistory;
 import actions.UpdateDataDisplayBoxAction;
 import actions.singleinstanceoperations.SetPointSizeOperation;
 import actions.singleinstanceoperations.UpdateFontSizeOperation;
@@ -65,6 +66,7 @@ public ActionsMenuBar(PaintPanel panel){
 		addAction(new EditUndoAction(panel));
 		addAction(new ZoomInAction(panel));
 		addAction(new ZoomOutAction(panel));
+		
 
 		//haskell
 		addAction(new AddHaskellComponent(panel));
@@ -84,6 +86,9 @@ public ActionsMenuBar(PaintPanel panel){
 		// add data annotation
 		addAction(new AddAnnotationAction(panel));
 		addAction(new RemoveAnnotationAction(panel));
+		
+		//view
+		addAction(new ShowHistory(panel));
 	}
 
 	private void addAction(PaintAction action) {

src/actions/menu/ActionsMenuBarTitles.java

@@ -142,5 +142,10 @@ public ActionsMenuBarTitles Annotations() {
 		append("Annotations");
 		return this;
 	}
+	
+	public ActionsMenuBarTitles RedoUndoHisotry(){
+		append("Redo/Undo Hisotry");
+		return this;
+	}
 
 }

src/ui/helper/historyui/HistoryDataObject.java

@@ -1,5 +1,6 @@
 package ui.helper.historyui;
 
+import java.security.UnrecoverableEntryException;
 
 /**
  * 
@@ -9,16 +10,38 @@
 public class HistoryDataObject {
 
 	String data;
+	int row;
+	boolean untraced;
+	public HistoryDataObject(){
+		
+	}
 
 	public HistoryDataObject(String data){
 		this.data = data;
+		untraced = false;
 	}
 
 
 	public String toString(){
+		if(untraced){
+			return "[untraced] " + data;
+		}
 		return data;
 	}
 
+	public void setRow(int i){
+		row = i;
+	}
 
+	public int getRow(){
+		return row;
+	}
 
+	public void setUntraced(boolean truth){
+		untraced = truth;
+	}
+	
+	public boolean getUntraced(){
+		return untraced;
+	}
 }