hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #157 from kruland2607/master

Browse Source 
When deleting a flight configuration, delete corresponding simulations
This commit is contained in:
kruland2607 2013-10-11 12:43:20 -07:00
commit 8bb76d72a2
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/net/sf/openrocket/document/OpenRocketDocument.java
View File

@ -281,6 +281,20 @@ public class OpenRocketDocument implements ComponentChangeListener {
return simulation; 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 * 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 * with {@link #SIMULATION_NAME_PREFIX} and has a unique number larger than any

1
core/src/net/sf/openrocket/rocketcomponent/Rocket.java
View File

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

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

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