From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Thu, 26 Apr 2012 18:18:55 +0000 (+0000)
Subject: Added optional Thickness element/property.
X-Git-Tag: upstream/12.09^2~318
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=9f60dfb3054c910b90c11ac625a2eb70f8e443bf;p=debian%2Fopenrocket

Added optional Thickness element/property.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@618 180e2498-e6e9-4542-8430-84ac67f01cd8
---

diff --git a/core/src/net/sf/openrocket/preset/xml/TransitionDTO.java b/core/src/net/sf/openrocket/preset/xml/TransitionDTO.java
index 463eceb6..c978b846 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<MaterialDTO> materials) throws InvalidComponentPresetException {
+    public Double getThickness() {
+		return thickness;
+	}
+
+	public void setThickness(Double thickness) {
+		this.thickness = thickness;
+	}
+
+	public ComponentPreset asComponentPreset(List<MaterialDTO> 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);
     }