From 6b322a610fb412edc207ba459a0f3c8bface5972 Mon Sep 17 00:00:00 2001 From: Daniel_M_Williams Date: Tue, 20 Oct 2015 17:57:09 -0400 Subject: [PATCH] Files now save boosterset compnonents --- .../file/openrocket/savers/ComponentAssemblySaver.java | 8 +++++--- .../src/net/sf/openrocket/rocketcomponent/BoosterSet.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/net/sf/openrocket/file/openrocket/savers/ComponentAssemblySaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/ComponentAssemblySaver.java index 50e593a41..ef624e2c4 100644 --- a/core/src/net/sf/openrocket/file/openrocket/savers/ComponentAssemblySaver.java +++ b/core/src/net/sf/openrocket/file/openrocket/savers/ComponentAssemblySaver.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import net.sf.openrocket.rocketcomponent.BoosterSet; import net.sf.openrocket.rocketcomponent.ComponentAssembly; import net.sf.openrocket.rocketcomponent.Instanceable; import net.sf.openrocket.rocketcomponent.PodSet; @@ -23,10 +24,11 @@ public class ComponentAssemblySaver extends RocketComponentSaver { list.add(""); instance.addParams(c, list); list.add(""); + } else if (c instanceof BoosterSet) { + list.add(""); + instance.addParams(c, list); + list.add(""); } - // BoosterSets are saved from subclass AxialStageSaver - // else if (c instanceof BoosterSet) { - } return list; diff --git a/core/src/net/sf/openrocket/rocketcomponent/BoosterSet.java b/core/src/net/sf/openrocket/rocketcomponent/BoosterSet.java index 64a77a9a0..b46c0dc67 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/BoosterSet.java +++ b/core/src/net/sf/openrocket/rocketcomponent/BoosterSet.java @@ -104,7 +104,7 @@ public class BoosterSet extends AxialStage implements FlightConfigurableComponen @Override public boolean isAfter(){ - return true; + return false; } @Override