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

Have createFlightConfiguration return FlightConfiguration instead of ID

Browse Source
This commit is contained in:
SiboVG 2022-10-25 14:54:59 +02:00
parent 3a0a185911
commit 1813806239
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -752,23 +752,23 @@ public class Rocket extends ComponentAssembly {
* Return a flight configuration. If the supplied id does not have a specific instance, the default is returned. * Return a flight configuration. If the supplied id does not have a specific instance, the default is returned.
* *
* @param fcid the flight configuration id * @param fcid the flight configuration id
* @return FlightConfiguration instance * @return FlightConfiguration instance
*/ */
public FlightConfigurationId createFlightConfiguration( final FlightConfigurationId fcid) { public FlightConfiguration createFlightConfiguration( final FlightConfigurationId fcid) {
checkState(); checkState();
if( null == fcid ){ if( null == fcid ){
// fall-through to the default case: // fall-through to the default case:
// ...creating a FlightConfiguration( null ) just allocates a fresh new FCID // ...creating a FlightConfiguration( null ) just allocates a fresh new FCID
}else if( fcid.hasError() ){ }else if( fcid.hasError() ){
return configSet.getDefault().getFlightConfigurationID(); return configSet.getDefault();
}else if( configSet.containsId(fcid)){ }else if( configSet.containsId(fcid)){
return fcid; return configSet.get(fcid);
} }
FlightConfiguration nextConfig = new FlightConfiguration(this, fcid); FlightConfiguration nextConfig = new FlightConfiguration(this, fcid);
this.configSet.set(nextConfig.getId(), nextConfig); this.configSet.set(nextConfig.getId(), nextConfig);
fireComponentChangeEvent(ComponentChangeEvent.TREE_CHANGE); fireComponentChangeEvent(ComponentChangeEvent.TREE_CHANGE);
return nextConfig.getFlightConfigurationID(); return nextConfig;
} }
/** /**

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

@ -941,7 +941,7 @@ public class TestRockets {
Rocket rocket = new Rocket(); Rocket rocket = new Rocket();
rocket.setName("Falcon9H Scale Rocket"); rocket.setName("Falcon9H Scale Rocket");
FlightConfigurationId selFCID = rocket.createFlightConfiguration( new FlightConfigurationId( FALCON_9H_FCID_1 )); FlightConfigurationId selFCID = rocket.createFlightConfiguration( new FlightConfigurationId( FALCON_9H_FCID_1 )).getFlightConfigurationID();
rocket.setSelectedConfiguration(selFCID); rocket.setSelectedConfiguration(selFCID);
// ====== Payload Stage ====== // ====== Payload Stage ======

6
core/test/net/sf/openrocket/rocketcomponent/AxialStageTest.java
View File

@ -16,7 +16,7 @@ public class AxialStageTest extends BaseTestCase {
public void testDisableStage() { public void testDisableStage() {
final Rocket rocket = TestRockets.makeFalcon9Heavy(); final Rocket rocket = TestRockets.makeFalcon9Heavy();
final FlightConfiguration config = rocket.getSelectedConfiguration(); final FlightConfiguration config = rocket.getSelectedConfiguration();
final FlightConfigurationId fcid = rocket.createFlightConfiguration(new FlightConfigurationId()); final FlightConfigurationId fcid = rocket.createFlightConfiguration(new FlightConfigurationId()).getFlightConfigurationID();
final FlightConfiguration config2 = rocket.getFlightConfiguration(fcid); final FlightConfiguration config2 = rocket.getFlightConfiguration(fcid);
// Disable the payload stage // Disable the payload stage
@ -106,7 +106,7 @@ public class AxialStageTest extends BaseTestCase {
public void testDisableStageAndMove() { public void testDisableStageAndMove() {
final Rocket rocket = TestRockets.makeFalcon9Heavy(); final Rocket rocket = TestRockets.makeFalcon9Heavy();
final FlightConfiguration config = rocket.getSelectedConfiguration(); final FlightConfiguration config = rocket.getSelectedConfiguration();
final FlightConfigurationId fcid = rocket.createFlightConfiguration(new FlightConfigurationId()); final FlightConfigurationId fcid = rocket.createFlightConfiguration(new FlightConfigurationId()).getFlightConfigurationID();
final FlightConfiguration config2 = rocket.getFlightConfiguration(fcid); final FlightConfiguration config2 = rocket.getFlightConfiguration(fcid);
// Disable the payload stage // Disable the payload stage
@ -173,7 +173,7 @@ public class AxialStageTest extends BaseTestCase {
public void testDisableStageAndCopy() { public void testDisableStageAndCopy() {
final Rocket rocket = TestRockets.makeFalcon9Heavy(); final Rocket rocket = TestRockets.makeFalcon9Heavy();
final FlightConfiguration config = rocket.getSelectedConfiguration(); final FlightConfiguration config = rocket.getSelectedConfiguration();
final FlightConfigurationId fcid = rocket.createFlightConfiguration(new FlightConfigurationId()); final FlightConfigurationId fcid = rocket.createFlightConfiguration(new FlightConfigurationId()).getFlightConfigurationID();
final FlightConfiguration config2 = rocket.getFlightConfiguration(fcid); final FlightConfiguration config2 = rocket.getFlightConfiguration(fcid);
// Disable the core stage // Disable the core stage