Merge pull request #157 from kruland2607/master

When deleting a flight configuration, delete corresponding simulations

core/src/net/sf/openrocket/document/OpenRocketDocument.java

@@ -281,6 +281,20 @@ public class OpenRocketDocument implements ComponentChangeListener {
 		return simulation;
 	}
 	
+	public void removeFlightConfigurationAndSimulations(String configId) {
+		if (configId == null) {
+			return;
+		}
+		for (Simulation s : getSimulations()) {
+			// Assumes modifiable collection - which it is
+			if (s.getConfiguration().getFlightConfigurationID().equals(configId)) {
+				removeSimulation(s);
+			}
+		}
+		rocket.removeFlightConfigurationID(configId);
+	}
+	
+	
 	/**
 	 * Return a unique name suitable for the next simulation.  The name begins
 	 * with {@link #SIMULATION_NAME_PREFIX} and has a unique number larger than any

core/src/net/sf/openrocket/rocketcomponent/Rocket.java

@@ -552,7 +552,6 @@ public class Rocket extends RocketComponent {
 			getDefaultConfiguration().setFlightConfigurationID(null);
 		}
 		flightConfigurationIDs.remove(id);
-		// FIXME - remove corresponding simulations?
 		fireComponentChangeEvent(ComponentChangeEvent.MOTOR_CHANGE);
 	}
 	

swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java

@@ -155,7 +155,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 		String currentId = rocket.getDefaultConfiguration().getFlightConfigurationID();
 		if (currentId == null)
 			return;
-		rocket.removeFlightConfigurationID(currentId);
+		document.removeFlightConfigurationAndSimulations(currentId);
 		configurationChanged();
 	}