Fix order of XML properties
This commit is contained in:
parent
c698332372
commit
11bed9142e
@ -30,6 +30,7 @@ import net.sf.openrocket.util.MathUtil;
|
|||||||
@XmlRootElement
|
@XmlRootElement
|
||||||
@XmlType(name="RASAeroBasePartDTO")
|
@XmlType(name="RASAeroBasePartDTO")
|
||||||
@XmlAccessorType(XmlAccessType.FIELD)
|
@XmlAccessorType(XmlAccessType.FIELD)
|
||||||
|
@XmlTransient
|
||||||
public class BasePartDTO {
|
public class BasePartDTO {
|
||||||
@XmlElement(name = RASAeroCommonConstants.PART_TYPE)
|
@XmlElement(name = RASAeroCommonConstants.PART_TYPE)
|
||||||
private String partType;
|
private String partType;
|
||||||
|
@ -13,6 +13,7 @@ import javax.xml.bind.annotation.XmlElement;
|
|||||||
import javax.xml.bind.annotation.XmlElementRef;
|
import javax.xml.bind.annotation.XmlElementRef;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
import javax.xml.bind.annotation.XmlTransient;
|
import javax.xml.bind.annotation.XmlTransient;
|
||||||
|
import javax.xml.bind.annotation.XmlType;
|
||||||
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||||
|
|
||||||
import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException;
|
import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException;
|
||||||
@ -21,6 +22,23 @@ import net.sf.openrocket.util.MathUtil;
|
|||||||
|
|
||||||
@XmlRootElement(name = RASAeroCommonConstants.BODY_TUBE)
|
@XmlRootElement(name = RASAeroCommonConstants.BODY_TUBE)
|
||||||
@XmlAccessorType(XmlAccessType.FIELD)
|
@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 {
|
public class BodyTubeDTO extends BasePartDTO implements BodyTubeDTOAdapter {
|
||||||
@XmlElement(name = RASAeroCommonConstants.LAUNCH_LUG_DIAMETER)
|
@XmlElement(name = RASAeroCommonConstants.LAUNCH_LUG_DIAMETER)
|
||||||
@XmlJavaTypeAdapter(CustomDoubleAdapter.class)
|
@XmlJavaTypeAdapter(CustomDoubleAdapter.class)
|
||||||
|
@ -67,7 +67,7 @@ public class BoosterDTO implements BodyTubeDTOAdapter {
|
|||||||
private Double shoulderLength;
|
private Double shoulderLength;
|
||||||
@XmlElement(name = RASAeroCommonConstants.NOZZLE_EXIT_DIAMETER)
|
@XmlElement(name = RASAeroCommonConstants.NOZZLE_EXIT_DIAMETER)
|
||||||
@XmlJavaTypeAdapter(CustomDoubleAdapter.class)
|
@XmlJavaTypeAdapter(CustomDoubleAdapter.class)
|
||||||
private Double nozzleExitDiameter;
|
private Double nozzleExitDiameter = 0d;
|
||||||
@XmlElement(name = RASAeroCommonConstants.BOATTAIL_LENGTH)
|
@XmlElement(name = RASAeroCommonConstants.BOATTAIL_LENGTH)
|
||||||
@XmlJavaTypeAdapter(CustomDoubleAdapter.class)
|
@XmlJavaTypeAdapter(CustomDoubleAdapter.class)
|
||||||
private Double boattailLength;
|
private Double boattailLength;
|
||||||
|
@ -10,6 +10,7 @@ import javax.xml.bind.annotation.XmlAccessType;
|
|||||||
import javax.xml.bind.annotation.XmlAccessorType;
|
import javax.xml.bind.annotation.XmlAccessorType;
|
||||||
import javax.xml.bind.annotation.XmlElement;
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
|
import javax.xml.bind.annotation.XmlType;
|
||||||
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||||
|
|
||||||
import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException;
|
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)
|
@XmlRootElement(name = RASAeroCommonConstants.NOSE_CONE)
|
||||||
@XmlAccessorType(XmlAccessType.FIELD)
|
@XmlAccessorType(XmlAccessType.FIELD)
|
||||||
|
@XmlType(propOrder = {
|
||||||
|
"partType",
|
||||||
|
"length",
|
||||||
|
"diameter",
|
||||||
|
"shape",
|
||||||
|
"bluntRadius",
|
||||||
|
"location",
|
||||||
|
"color",
|
||||||
|
"powerLaw"
|
||||||
|
})
|
||||||
public class NoseConeDTO extends BasePartDTO {
|
public class NoseConeDTO extends BasePartDTO {
|
||||||
|
|
||||||
@XmlElement(name = RASAeroCommonConstants.SHAPE)
|
@XmlElement(name = RASAeroCommonConstants.SHAPE)
|
||||||
|
@ -12,6 +12,7 @@ import javax.xml.bind.annotation.XmlElement;
|
|||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
import javax.xml.bind.annotation.XmlSeeAlso;
|
import javax.xml.bind.annotation.XmlSeeAlso;
|
||||||
import javax.xml.bind.annotation.XmlTransient;
|
import javax.xml.bind.annotation.XmlTransient;
|
||||||
|
import javax.xml.bind.annotation.XmlType;
|
||||||
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||||
|
|
||||||
import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException;
|
import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException;
|
||||||
@ -22,6 +23,14 @@ import net.sf.openrocket.util.MathUtil;
|
|||||||
|
|
||||||
@XmlRootElement(name = RASAeroCommonConstants.TRANSITION)
|
@XmlRootElement(name = RASAeroCommonConstants.TRANSITION)
|
||||||
@XmlAccessorType(XmlAccessType.FIELD)
|
@XmlAccessorType(XmlAccessType.FIELD)
|
||||||
|
@XmlType(propOrder = {
|
||||||
|
"partType",
|
||||||
|
"length",
|
||||||
|
"diameter",
|
||||||
|
"rearDiameter",
|
||||||
|
"location",
|
||||||
|
"color"
|
||||||
|
})
|
||||||
@XmlSeeAlso({BoattailDTO.class})
|
@XmlSeeAlso({BoattailDTO.class})
|
||||||
public class TransitionDTO extends BasePartDTO {
|
public class TransitionDTO extends BasePartDTO {
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user