From b990a5acb246f24003f21c09e547fd4af94b1fb9 Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Thu, 26 Apr 2012 18:18:55 +0000 Subject: [PATCH] Added optional Thickness element/property. --- .../openrocket/preset/xml/TransitionDTO.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/core/src/net/sf/openrocket/preset/xml/TransitionDTO.java b/core/src/net/sf/openrocket/preset/xml/TransitionDTO.java index 463eceb60..c978b846c 100644 --- a/core/src/net/sf/openrocket/preset/xml/TransitionDTO.java +++ b/core/src/net/sf/openrocket/preset/xml/TransitionDTO.java @@ -38,6 +38,9 @@ public class TransitionDTO extends BaseComponentDTO { @XmlElement(name = "Length") private double length; + + @XmlElement(name = "Thickness") + private Double thickness; /** @@ -63,6 +66,9 @@ public class TransitionDTO extends BaseComponentDTO { setAftShoulderDiameter(thePreset.get(ComponentPreset.AFT_SHOULDER_DIAMETER)); setAftShoulderLength(thePreset.get(ComponentPreset.AFT_SHOULDER_LENGTH)); setLength(thePreset.get(ComponentPreset.LENGTH)); + if ( thePreset.has(ComponentPreset.THICKNESS)) { + setThickness(thePreset.get(ComponentPreset.THICKNESS)); + } } public ShapeDTO getShape() { @@ -129,7 +135,15 @@ public class TransitionDTO extends BaseComponentDTO { length = theLength; } - public ComponentPreset asComponentPreset(List materials) throws InvalidComponentPresetException { + public Double getThickness() { + return thickness; + } + + public void setThickness(Double thickness) { + this.thickness = thickness; + } + + public ComponentPreset asComponentPreset(List materials) throws InvalidComponentPresetException { TypedPropertyMap props = new TypedPropertyMap(); addProps(props, materials); props.put(ComponentPreset.SHAPE, shape.getORShape()); @@ -141,6 +155,9 @@ public class TransitionDTO extends BaseComponentDTO { props.put(ComponentPreset.AFT_SHOULDER_LENGTH, this.getAftShoulderLength()); props.put(ComponentPreset.LENGTH, this.getLength()); props.put(ComponentPreset.TYPE, ComponentPreset.Type.TRANSITION); + if ( thickness != null ) { + props.put(ComponentPreset.THICKNESS, thickness); + } return ComponentPresetFactory.create(props); }