[Refine] Refining the FlightConfiguration UI behavior

- the selected configuration in a rocket is now specified by id instead of instance
- tighted up Configuration UI behavior - operations should now start from selected configuration row

core/src/net/sf/openrocket/file/openrocket/importt/MotorConfigurationHandler.java

@@ -62,9 +62,7 @@ class MotorConfigurationHandler extends AbstractElementHandler {
 		}
 		
 		if ("true".equals(attributes.remove("default"))) {
-			// also associate this configuration with the default. 
+			rocket.setSelectedConfiguration( fcid);
-			FlightConfiguration fc = rocket.getFlightConfiguration(fcid);
-			rocket.setSelectedConfiguration( fc);
 		}
 		
 		super.closeElement(element, attributes, content, warnings);

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

@@ -344,14 +344,6 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 		modID++;
 	}
 
-	public Set<MotorConfigurationId> getMotorIDs() {
-		return motors.keySet();
-	}
-	
-	public MotorConfiguration getMotorInstance(MotorConfigurationId id) {
-		return motors.get(id);
-	}
-	
 	public boolean hasMotors() {
 		return (0 < motors.size());
 	}

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

@@ -511,7 +511,7 @@ public class Rocket extends RocketComponent {
 	public void freeze() {
 		checkState();
 		if (freezeList == null) {
-			freezeList = new LinkedList<ComponentChangeEvent>();
+			freezeList = new LinkedList<>();
 			log.debug("Freezing Rocket");
 		} else {
 			Application.getExceptionHandler().handleErrorCondition("Attempting to freeze Rocket when it is already frozen, " +
@@ -702,24 +702,12 @@ public class Rocket extends RocketComponent {
 		return idList.get(configIndex);
 	}
 
-	public void setSelectedConfiguration(final FlightConfiguration config) {
+	public void setSelectedConfiguration(final FlightConfigurationId selectId) {
 		checkState();
-		this.selectedConfiguration = config;
+		this.selectedConfiguration = this.configSet.get( selectId );
 		fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
 	}	
 
-	public void setDefaultConfiguration(final FlightConfigurationId fcid) {
-		checkState();
-		
-		if( fcid.hasError() ){
-			log.error("attempt to set a 'fcid = config' with a error fcid.  Ignored.", new IllegalArgumentException("error id:"+fcid));
-			return;
-		}else if( this.configSet.containsId(fcid)){
-			this.selectedConfiguration = configSet.get(fcid);
-			fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
-		}
-	}	
-	
 	/**
 	 * Associate the given ID and flight configuration.
 	 * <code>null</code> or an empty string.

core/src/net/sf/openrocket/util/TestRockets.java

@@ -515,7 +515,7 @@ public class TestRockets {
 		bodytube.setMaterial(material);
 		finset.setMaterial(material);
 		
-		rocket.setSelectedConfiguration( rocket.getFlightConfiguration( fcid[0]));
+		rocket.setSelectedConfiguration( fcid[0] );
 		rocket.getSelectedConfiguration().setAllStages();
 		rocket.enableEvents();
 		return rocket;
@@ -535,7 +535,6 @@ public class TestRockets {
 			fcid[i] = new FlightConfigurationId();
 			rocket.createFlightConfiguration(fcid[i]);
 		}
-		FlightConfiguration selectedConfiguration = rocket.getFlightConfiguration(fcid[0]);
 
 		double noseconeLength = 0.07;
 		double noseconeRadius = 0.012;
@@ -708,7 +707,7 @@ public class TestRockets {
 
 		}
 		rocket.getSelectedConfiguration().setAllStages();
-		rocket.setSelectedConfiguration( selectedConfiguration );
+		rocket.setSelectedConfiguration( fcid[0] );
 		rocket.enableEvents();
 		return rocket;
 	}
@@ -1024,10 +1023,9 @@ public class TestRockets {
 		Rocket rocket = new Rocket();
 		rocket.setName("Falcon9H Scale Rocket");
 
-
         FlightConfiguration selConfig = rocket.createFlightConfiguration(null);
-        rocket.setSelectedConfiguration(selConfig);
         FlightConfigurationId selFCID = selConfig.getFlightConfigurationID();
+        rocket.setSelectedConfiguration(selFCID);
 
 		// ====== Payload Stage ======
 		// ====== ====== ====== ======
@@ -1175,7 +1173,7 @@ public class TestRockets {
 		}
 		
 		rocket.enableEvents();
-		rocket.setSelectedConfiguration(selConfig);
+		rocket.setSelectedConfiguration( selFCID);
 		selConfig.setAllStages();
 		
 		return rocket;

swing/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java

@@ -1166,10 +1166,6 @@ public class GeneralOptimizationDialog extends JDialog {
 			selectedModifierDescription.setText("");
 		}
 
-		// Update the active configuration
-		FlightConfigurationId fcid = getSelectedSimulation().getId();
-		getSelectedSimulation().getRocket().setDefaultConfiguration(fcid);
-		
 		updating = false;
 	}
 	

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

@@ -115,23 +115,22 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 		updateButtonState();
 
 		this.add(tabs, "spanx, grow, wrap rel");
-
 	}
 	
 	private void addConfiguration() {
-		FlightConfigurationId newFCID = new FlightConfigurationId();
+		FlightConfigurationId newId = new FlightConfigurationId();
-		FlightConfiguration newConfig = new FlightConfiguration( rocket, newFCID );
+		FlightConfiguration newConfig = new FlightConfiguration( rocket, newId );
-		rocket.setFlightConfiguration(newFCID, newConfig);
+		rocket.setFlightConfiguration( newId, newConfig);
 
 		// Create a new simulation for this configuration.
-		createSimulationForNewConfiguration();
+		createSimulationForNewConfiguration( newId );
 		
 		configurationChanged();
 	}
 	
 	private void copyConfiguration() {
-        FlightConfiguration oldConfig = rocket.getSelectedConfiguration();
+        FlightConfigurationId oldId = this.motorConfigurationPanel.getSelectedConfigurationId();
-        FlightConfigurationId oldId = oldConfig.getFlightConfigurationID();
+        FlightConfiguration oldConfig = rocket.getFlightConfiguration(oldId);
 
         FlightConfigurationId newId = new FlightConfigurationId();
 		FlightConfiguration newConfig = oldConfig.copy( newId);
@@ -141,10 +140,11 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 				((FlightConfigurableComponent) c).copyFlightConfiguration(oldId, newId);
 			}
 		}
-		rocket.setFlightConfiguration(newId, newConfig);
+        rocket.setFlightConfiguration( newId, newConfig);
+
 
         // Create a new simulation for this configuration.
-		createSimulationForNewConfiguration();
+		createSimulationForNewConfiguration( newId);
 		
 		configurationChanged();
 	}
@@ -165,7 +165,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 	/**
 	 * prereq - assumes that the new configuration has been set as the default configuration.
 	 */
-	private void createSimulationForNewConfiguration() {
+	private void createSimulationForNewConfiguration( final FlightConfigurationId fcid ) {
 		Simulation newSim = new Simulation(rocket);
 		OpenRocketDocument doc = BasicFrame.findDocument(rocket);
         if (doc != null) {

swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java

@@ -320,7 +320,7 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
 			@Override
 			public void actionPerformed(ActionEvent ae) {
 				FlightConfiguration newConfig = (FlightConfiguration)configComboBox.getSelectedItem();
-				document.getRocket().setSelectedConfiguration( newConfig);
+                document.getRocket().setSelectedConfiguration( newConfig.getId());
 				updateExtras();
 				updateFigures();
 			}