Merge lp:~yrke/tapaal/fix-940280-stepbackforwardenabled into lp:tapaal

[Kenneth Yrke Jørgensen]

Merged branck with fix for bug #940280

Merged branck with fix for bug #940280

[Jiri Srba (srba)]

Line 145 in file src/pipe/gui/GuiFrame.java

System.out.println("Back!");

Is probably not supposed to stay in the merged branch.

[Mathias Andersen (mande09)]

review: Approve

[Jiri Srba (srba)]

review: Needs Fixing

[Jiri Srba (srba)]

review: Approve

[TAPAAL Janitor (tapaal)]

Attempt to merge into lp:tapaal failed due to conflicts:

text conflict in src/pipe/gui/AnimationController.java

[Jiri Srba (srba)]

There is a conflict, Kenneth can you take a look?

[TAPAAL Janitor (tapaal)]

Attempt to merge into lp:tapaal failed due to conflicts:

text conflict in src/pipe/gui/AnimationController.java

[Jiri Srba (srba)]

A conflict has to be resolved.

review: Needs Fixing

[lp:~yrke/tapaal/fix-940280-stepbackforwardenabled]

665. By Kenneth Yrke Jørgensen on 2012-02-29

Merged with trunk

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/pipe/gui/AnimationController.java'
--- src/pipe/gui/AnimationController.java	2012-02-24 11:52:06 +0000
+++ src/pipe/gui/AnimationController.java	2012-02-29 15:33:22 +0000
@@ -29,6 +29,7 @@
 import javax.swing.border.EmptyBorder;
 
 import pipe.dataLayer.NetType;
+import pipe.gui.GuiFrame.AnimateAction;
 import pipe.gui.Pipe.ElementType;
 import pipe.gui.action.GuiAction;
 import dk.aau.cs.gui.components.NonsearchableJComboBox;
@@ -91,13 +92,10 @@
 			randomAction, randomAnimateAction, timeAction;
 
 	public AnimationController() {
-		startAction = new AnimateAction("Simulation mode", ElementType.START,
-				"Toggle simulation mode", "Ctrl A", true);
+		startAction = CreateGui.appGui.startAction;
 
-		stepbackwardAction = new AnimateAction("Step backward", ElementType.STEPBACKWARD,
-				"Step backward", "typed 4");
-		stepforwardAction = new AnimateAction("Step forward", ElementType.STEPFORWARD,
-				"Step forward", "typed 6");
+		stepbackwardAction = CreateGui.appGui.stepbackwardAction;
+		stepforwardAction = CreateGui.appGui.stepforwardAction;
 
 		stepbackwardAction.setEnabled(false);
 		stepforwardAction.setEnabled(false);
@@ -105,10 +103,10 @@
 		// timeAction = new AnimateAction("Time", Pipe.TIMEPASS,
 		// "Let Time pass", "_");
 
-		randomAction = new AnimateAction("Random", ElementType.RANDOM,
-				"Randomly fire a transition", "typed 5");
-		randomAnimateAction = new AnimateAction("Simulate", ElementType.ANIMATE,
-				"Randomly fire a number of transitions", "typed 7", true);
+		//randomAction = new AnimateAction("Random", ElementType.RANDOM,
+		//		"Randomly fire a transition", "typed 5");
+		//randomAnimateAction = new AnimateAction("Simulate", ElementType.ANIMATE,
+		//		"Randomly fire a number of transitions", "typed 7", true);
 
 		setLayout(new GridBagLayout());
 		GridBagConstraints c = new GridBagConstraints();
@@ -315,71 +313,6 @@
 		return timeDelayToSet;
 	}
 
-	class AnimateAction extends GuiAction {
-
-		/**
-		 * 
-		 */
-		private static final long serialVersionUID = -4066032248332540289L;
-		private ElementType typeID;
-		private AnimationHistoryComponent animBox;
-
-		AnimateAction(String name, ElementType typeID, String tooltip, String keystroke) {
-			super(name, tooltip, keystroke);
-			this.typeID = typeID;
-		}
-
-		AnimateAction(String name, ElementType typeID, String tooltip,
-				String keystroke, boolean toggleable) {
-			super(name, tooltip, keystroke, toggleable);
-			this.typeID = typeID;
-		}
-
-		public AnimateAction(String name, ElementType typeID, String tooltip,
-				KeyStroke keyStroke) {
-			super(name, tooltip, keyStroke);
-			this.typeID = typeID;
-		}
-
-		public void actionPerformed(ActionEvent ae) {
-
-			animBox = CreateGui.getAnimationHistory();
-
-			switch (typeID) {
-			case TIMEPASS:
-				CreateGui.getAnimator().letTimePass(
-						new BigDecimal(1, new MathContext(Pipe.AGE_PRECISION)));
-
-				setAnimationButtonsEnabled();
-
-				break;
-
-			// case Pipe.RANDOM:
-			// animBox.clearStepsForward();
-			// CreateGui.getAnimator().doRandomFiring();
-			//
-			// setAnimationButtonsEnabled();
-			// break;
-
-			case STEPFORWARD:
-				animBox.stepForward();
-				CreateGui.getAnimator().stepForward();
-				setAnimationButtonsEnabled();
-				break;
-
-			case STEPBACKWARD:
-				animBox.stepBackwards();
-				CreateGui.getAnimator().stepBack();
-				setAnimationButtonsEnabled();
-				break;
-
-			default:
-				break;
-			}
-		}
-
-	}
-
 	private void setEnabledStepbackwardAction(boolean b) {
 		stepbackwardAction.setEnabled(b);
 

=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2012-02-27 11:01:43 +0000
+++ src/pipe/gui/GuiFrame.java	2012-02-29 15:33:22 +0000
@@ -126,7 +126,7 @@
 	private TypeAction transportArcAction;
 
 
-	private AnimateAction startAction, stepforwardAction, stepbackwardAction,
+	public AnimateAction startAction, stepforwardAction, stepbackwardAction,
 	randomAction, randomAnimateAction, timeAction;
 
 	public boolean dragging = false;
@@ -1562,9 +1562,10 @@
 					startAction.setSelected(false);
 					appView.changeAnimationMode(false);
 				}
+				
 				stepforwardAction.setEnabled(false);
 				stepbackwardAction.setEnabled(false);
-				
+					
 				// XXX
 				// This is a fix for bug #812694 where on mac some menues are gray after
 				// changing from simulation mode, when displaying a trace. Showing and