diff --git a/core/src/net/sf/openrocket/file/rasaero/export/BasePartDTO.java b/core/src/net/sf/openrocket/file/rasaero/export/BasePartDTO.java index b72801c82..926e4ef90 100644 --- a/core/src/net/sf/openrocket/file/rasaero/export/BasePartDTO.java +++ b/core/src/net/sf/openrocket/file/rasaero/export/BasePartDTO.java @@ -30,6 +30,7 @@ import net.sf.openrocket.util.MathUtil; @XmlRootElement @XmlType(name="RASAeroBasePartDTO") @XmlAccessorType(XmlAccessType.FIELD) +@XmlTransient public class BasePartDTO { @XmlElement(name = RASAeroCommonConstants.PART_TYPE) private String partType; diff --git a/core/src/net/sf/openrocket/file/rasaero/export/BodyTubeDTO.java b/core/src/net/sf/openrocket/file/rasaero/export/BodyTubeDTO.java index 382044398..371c38d3c 100644 --- a/core/src/net/sf/openrocket/file/rasaero/export/BodyTubeDTO.java +++ b/core/src/net/sf/openrocket/file/rasaero/export/BodyTubeDTO.java @@ -13,6 +13,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; +import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException; @@ -21,6 +22,23 @@ import net.sf.openrocket.util.MathUtil; @XmlRootElement(name = RASAeroCommonConstants.BODY_TUBE) @XmlAccessorType(XmlAccessType.FIELD) +@XmlType(propOrder = { + "partType", + "length", + "diameter", + "launchLugDiameter", + "launchLugLength", + "railGuideDiameter", + "railGuideHeight", + "launchShoeArea", + "location", + "color", + "boattailLength", + "boattailRearDiameter", + "boattailOffset", + "overhang", + "fin" +}) public class BodyTubeDTO extends BasePartDTO implements BodyTubeDTOAdapter { @XmlElement(name = RASAeroCommonConstants.LAUNCH_LUG_DIAMETER) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) diff --git a/core/src/net/sf/openrocket/file/rasaero/export/BoosterDTO.java b/core/src/net/sf/openrocket/file/rasaero/export/BoosterDTO.java index 1080f9b1a..0332d510f 100644 --- a/core/src/net/sf/openrocket/file/rasaero/export/BoosterDTO.java +++ b/core/src/net/sf/openrocket/file/rasaero/export/BoosterDTO.java @@ -67,7 +67,7 @@ public class BoosterDTO implements BodyTubeDTOAdapter { private Double shoulderLength; @XmlElement(name = RASAeroCommonConstants.NOZZLE_EXIT_DIAMETER) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double nozzleExitDiameter; + private Double nozzleExitDiameter = 0d; @XmlElement(name = RASAeroCommonConstants.BOATTAIL_LENGTH) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) private Double boattailLength; diff --git a/core/src/net/sf/openrocket/file/rasaero/export/NoseConeDTO.java b/core/src/net/sf/openrocket/file/rasaero/export/NoseConeDTO.java index 95c3d5498..267741701 100644 --- a/core/src/net/sf/openrocket/file/rasaero/export/NoseConeDTO.java +++ b/core/src/net/sf/openrocket/file/rasaero/export/NoseConeDTO.java @@ -10,6 +10,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException; @@ -17,6 +18,16 @@ import net.sf.openrocket.file.rasaero.RASAeroCommonConstants.NoseConeShapeSettin @XmlRootElement(name = RASAeroCommonConstants.NOSE_CONE) @XmlAccessorType(XmlAccessType.FIELD) +@XmlType(propOrder = { + "partType", + "length", + "diameter", + "shape", + "bluntRadius", + "location", + "color", + "powerLaw" +}) public class NoseConeDTO extends BasePartDTO { @XmlElement(name = RASAeroCommonConstants.SHAPE) diff --git a/core/src/net/sf/openrocket/file/rasaero/export/TransitionDTO.java b/core/src/net/sf/openrocket/file/rasaero/export/TransitionDTO.java index a54fc2dc9..26aa2bd16 100644 --- a/core/src/net/sf/openrocket/file/rasaero/export/TransitionDTO.java +++ b/core/src/net/sf/openrocket/file/rasaero/export/TransitionDTO.java @@ -12,6 +12,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlTransient; +import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException; @@ -22,6 +23,14 @@ import net.sf.openrocket.util.MathUtil; @XmlRootElement(name = RASAeroCommonConstants.TRANSITION) @XmlAccessorType(XmlAccessType.FIELD) +@XmlType(propOrder = { + "partType", + "length", + "diameter", + "rearDiameter", + "location", + "color" +}) @XmlSeeAlso({BoattailDTO.class}) public class TransitionDTO extends BasePartDTO {