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

Test argument in FlightConfigurationID constructor. Initialize

Browse Source 
FlightConfigurationID in SimulationOptions to new random id.  Make the
TestRockets compile
This commit is contained in:
Kevin Ruland 2015-12-14 20:58:05 -06:00
parent 88f84396d0
commit 391571708f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationID.java
View File

@ -23,7 +23,7 @@ public final class FlightConfigurationID implements Comparable<FlightConfigurati
} }
public FlightConfigurationID(final String _str) { public FlightConfigurationID(final String _str) {
if("".equals(_str)){ if(_str == null || "".equals(_str)){
this.key = UUID.randomUUID(); this.key = UUID.randomUUID();
}else{ }else{
this.key = UUID.fromString( _str); this.key = UUID.fromString( _str);

2
core/src/net/sf/openrocket/simulation/SimulationOptions.java
View File

@ -51,7 +51,7 @@ public class SimulationOptions implements ChangeSource, Cloneable {
protected final Preferences preferences = Application.getPreferences(); protected final Preferences preferences = Application.getPreferences();
private final Rocket rocket; private final Rocket rocket;
private FlightConfigurationID configId = FlightConfigurationID.ERROR_CONFIGURATION_FCID; private FlightConfigurationID configId = new FlightConfigurationID();
/* /*
* NOTE: When adding/modifying parameters, they must also be added to the * NOTE: When adding/modifying parameters, they must also be added to the

2
core/src/net/sf/openrocket/util/TestRockets.java
View File

@ -1156,7 +1156,7 @@ public class TestRockets {
public static OpenRocketDocument makeTestRocket_v106_withMotorMountIgnitionConfig() { public static OpenRocketDocument makeTestRocket_v106_withMotorMountIgnitionConfig() {
Rocket rocket = new Rocket(); Rocket rocket = new Rocket();
rocket.setName("v106_withwithMotorMountIgnitionConfig"); rocket.setName("v106_withwithMotorMountIgnitionConfig");
FlightConfigurationID fcid = new FlightConfigurationID("2SecondDelay"); FlightConfigurationID fcid = new FlightConfigurationID();
// make stage // make stage
AxialStage stage = new AxialStage(); AxialStage stage = new AxialStage();