From 6d70cc61f1ce2c893f1765ea21363ff775d0ed41 Mon Sep 17 00:00:00 2001
From: Daniel_M_Williams <equipoise@gmail.com>
Date: Sat, 22 Oct 2016 18:52:25 -0400
Subject: [PATCH] [Fix][Issue #294] Multiple fixes to ensure undo & redo
 function correctly

- The Rocket#trackStages function needs to handle being updated with the same stage id#, but different instance
- Rocket#update now updates the stageMap
- FlightConfigurations refactored to use stage numbers instead of references.
---
 .../rocketcomponent/FlightConfiguration.java  | 40 ++++++++-----------
 .../sf/openrocket/rocketcomponent/Rocket.java | 17 +++++++-
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
index bb637dcc5..8a2f4f11f 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
@@ -3,7 +3,6 @@ package net.sf.openrocket.rocketcomponent;
 import java.util.ArrayDeque;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Queue;
 
@@ -42,18 +41,17 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 
 	private class StageFlags implements Cloneable {
 		public boolean active = true;
-		public int prev = -1;
-		public AxialStage stage = null;
+		//public int prev = -1;
+		public int stageNumber = -1;
 		
-		public StageFlags(AxialStage _stage, int _prev, boolean _active) {
-			this.stage = _stage;
-			this.prev = _prev;
+		public StageFlags( int _num, boolean _active) {
+			this.stageNumber = _num;
 			this.active = _active;
 		}
 		
 		@Override
 		public StageFlags clone(){
-			return new StageFlags( this.stage, this.prev, true);
+			return new StageFlags( this.stageNumber, true);
 		}
 	}
 	
@@ -191,7 +189,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 		
 		for (StageFlags flags : this.stages.values()) {
 			if (flags.active) {
-				activeStages.add(flags.stage);
+				activeStages.add( rocket.getStage( flags.stageNumber) );
 			}
 		}
 		
@@ -215,7 +213,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 		AxialStage bottomStage = null;
 		for (StageFlags curFlags : this.stages.values()) {
 			if (curFlags.active) {
-				bottomStage = curFlags.stage;
+				bottomStage = rocket.getStage( curFlags.stageNumber);
 			}
 		}
 		return bottomStage;
@@ -264,18 +262,14 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 	}
 	
 	private void updateStages() {
-		if (this.rocket.getStageCount() == this.stages.size()) {
-			// no changes needed
-			return;
-		}
-		
+        if (this.rocket.getStageCount() == this.stages.size()) {
+            return;
+        }
+	                		
 		this.stages.clear();
 		for (AxialStage curStage : this.rocket.getStageList()) {
-			int prevStageNum = curStage.getStageNumber() - 1;
-			if (curStage.getParent() instanceof AxialStage) {
-				prevStageNum = curStage.getParent().getStageNumber();
-			}
-			StageFlags flagsToAdd = new StageFlags(curStage, prevStageNum, true);
+			
+			StageFlags flagsToAdd = new StageFlags( curStage.getStageNumber(), true);
 			this.stages.put(curStage.getStageNumber(), flagsToAdd);
 		}
 	}
@@ -361,9 +355,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 	private void updateMotors() {
 		this.motors.clear();
 		
-		Iterator<RocketComponent> iter = rocket.iterator(false);
-		while( iter.hasNext() ){
-			RocketComponent comp = iter.next();
+		for ( RocketComponent comp : getActiveComponents() ){
 			if (( comp instanceof MotorMount )&&( ((MotorMount)comp).isMotorMount())){
 				MotorMount mount = (MotorMount)comp;
 				MotorConfiguration motorConfig = mount.getMotorConfig( fcid);
@@ -532,8 +524,8 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 		final String fmt = "    [%-2s][%4s]: %6s \n";
 		buf.append(String.format(fmt, "#", "?actv", "Name"));
 		for (StageFlags flags : stages.values()) {
-			AxialStage curStage = flags.stage;
-			buf.append(String.format(fmt, curStage.getStageNumber(), (flags.active?" on": "off"), curStage.getName()));
+			final int stageNumber = flags.stageNumber;
+			buf.append(String.format(fmt, stageNumber, (flags.active?" on": "off"), rocket.getStage( stageNumber).getName()));
 		}
 		buf.append("\n");
 		return buf.toString();
diff --git a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
index e1c47ec65..e62fc9146 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
@@ -226,7 +226,12 @@ public class Rocket extends RocketComponent {
 		AxialStage value = stageMap.get(stageNumber);
 		
 		if (newStage.equals(value)) {
-			// stage is already added. skip.
+			// stage is already added
+			if( newStage != value ){
+				// but the value is the wrong instance
+				stageMap.put(stageNumber, newStage);
+			}
+			return;
 		} else {
 			stageNumber = getNewStageNumber();
 			newStage.setStageNumber(stageNumber);
@@ -454,9 +459,19 @@ public class Rocket extends RocketComponent {
 	
 	@Override
 	public void update(){
+		updateStageMap();
 		updateConfigurations();
 	}
 	
+	private void updateStageMap(){
+		for( RocketComponent component : getChildren() ){
+			if (component instanceof AxialStage) {
+				AxialStage stage = (AxialStage) component;
+				trackStage(stage);
+			}
+		}
+	}
+	
 	private void updateConfigurations(){
 		this.selectedConfiguration.update();
 		for( FlightConfiguration config : configSet ){