From 181380623967f25b1a92ef78c9ac93e01622c451 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Tue, 25 Oct 2022 14:54:59 +0200 Subject: [PATCH] Have createFlightConfiguration return FlightConfiguration instead of ID --- core/src/net/sf/openrocket/rocketcomponent/Rocket.java | 10 +++++----- core/src/net/sf/openrocket/util/TestRockets.java | 2 +- .../sf/openrocket/rocketcomponent/AxialStageTest.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java index f7337b3e4..173c55268 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java @@ -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. * * @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(); if( null == fcid ){ // fall-through to the default case: // ...creating a FlightConfiguration( null ) just allocates a fresh new FCID }else if( fcid.hasError() ){ - return configSet.getDefault().getFlightConfigurationID(); + return configSet.getDefault(); }else if( configSet.containsId(fcid)){ - return fcid; + return configSet.get(fcid); } FlightConfiguration nextConfig = new FlightConfiguration(this, fcid); this.configSet.set(nextConfig.getId(), nextConfig); fireComponentChangeEvent(ComponentChangeEvent.TREE_CHANGE); - return nextConfig.getFlightConfigurationID(); + return nextConfig; } /** diff --git a/core/src/net/sf/openrocket/util/TestRockets.java b/core/src/net/sf/openrocket/util/TestRockets.java index 8abb6559b..44dc7b827 100644 --- a/core/src/net/sf/openrocket/util/TestRockets.java +++ b/core/src/net/sf/openrocket/util/TestRockets.java @@ -941,7 +941,7 @@ public class TestRockets { Rocket rocket = new 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); // ====== Payload Stage ====== diff --git a/core/test/net/sf/openrocket/rocketcomponent/AxialStageTest.java b/core/test/net/sf/openrocket/rocketcomponent/AxialStageTest.java index e745df42c..32e576010 100644 --- a/core/test/net/sf/openrocket/rocketcomponent/AxialStageTest.java +++ b/core/test/net/sf/openrocket/rocketcomponent/AxialStageTest.java @@ -16,7 +16,7 @@ public class AxialStageTest extends BaseTestCase { public void testDisableStage() { final Rocket rocket = TestRockets.makeFalcon9Heavy(); 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); // Disable the payload stage @@ -106,7 +106,7 @@ public class AxialStageTest extends BaseTestCase { public void testDisableStageAndMove() { final Rocket rocket = TestRockets.makeFalcon9Heavy(); 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); // Disable the payload stage @@ -173,7 +173,7 @@ public class AxialStageTest extends BaseTestCase { public void testDisableStageAndCopy() { final Rocket rocket = TestRockets.makeFalcon9Heavy(); 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); // Disable the core stage