create changelog entry

[debian/openrocket] / core / src / net / sf / openrocket / file / rocksim / export / AbstractTransitionDTO.java

diff --git a/core/src/net/sf/openrocket/file/rocksim/export/AbstractTransitionDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/AbstractTransitionDTO.java
index 10386bbede5073b22d5a7443fb6a75f688e02224..987bc203362be60ce3aed7d2b24f92eca952c487 100644 (file)
--- a/core/src/net/sf/openrocket/file/rocksim/export/AbstractTransitionDTO.java
+++ b/core/src/net/sf/openrocket/file/rocksim/export/AbstractTransitionDTO.java
@@ -1,7 +1,7 @@
 package net.sf.openrocket.file.rocksim.export;
 
-import net.sf.openrocket.file.rocksim.importt.RocksimHandler;
-import net.sf.openrocket.file.rocksim.importt.RocksimNoseConeCode;
+import net.sf.openrocket.file.rocksim.RocksimCommonConstants;
+import net.sf.openrocket.file.rocksim.RocksimNoseConeCode;
 import net.sf.openrocket.rocketcomponent.BodyTube;
 import net.sf.openrocket.rocketcomponent.Bulkhead;
 import net.sf.openrocket.rocketcomponent.CenteringRing;
@@ -29,27 +29,27 @@ import java.util.List;
  * Transition to a Rocksim Transition.
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-public class AbstractTransitionDTO extends BasePartDTO {
+public class AbstractTransitionDTO extends BasePartDTO implements AttachableParts {
 
-    @XmlElement(name = "ShapeCode")
+    @XmlElement(name = RocksimCommonConstants.SHAPE_CODE)
     private int shapeCode = 1;
-    @XmlElement(name = "ConstructionType")
+    @XmlElement(name = RocksimCommonConstants.CONSTRUCTION_TYPE)
     private int constructionType = 1;
-    @XmlElement(name = "WallThickness")
+    @XmlElement(name = RocksimCommonConstants.WALL_THICKNESS)
     private double wallThickness = 0d;
-    @XmlElement(name = "ShapeParameter")
+    @XmlElement(name = RocksimCommonConstants.SHAPE_PARAMETER)
     private double shapeParameter = 0d;
 
-    @XmlElementWrapper(name = "AttachedParts")
+    @XmlElementWrapper(name = RocksimCommonConstants.ATTACHED_PARTS)
     @XmlElementRefs({
-            @XmlElementRef(name = "BodyTube", type = BodyTubeDTO.class),
-            @XmlElementRef(name = "BodyTube", type = InnerBodyTubeDTO.class),
-            @XmlElementRef(name = "FinSet", type = FinSetDTO.class),
-            @XmlElementRef(name = "CustomFinSet", type = CustomFinSetDTO.class),
-            @XmlElementRef(name = "Ring", type = CenteringRingDTO.class),
-            @XmlElementRef(name = "Streamer", type = StreamerDTO.class),
-            @XmlElementRef(name = "Parachute", type = ParachuteDTO.class),
-            @XmlElementRef(name = "MassObject", type = MassObjectDTO.class)})
+            @XmlElementRef(name = RocksimCommonConstants.BODY_TUBE, type = BodyTubeDTO.class),
+            @XmlElementRef(name = RocksimCommonConstants.BODY_TUBE, type = InnerBodyTubeDTO.class),
+            @XmlElementRef(name = RocksimCommonConstants.FIN_SET, type = FinSetDTO.class),
+            @XmlElementRef(name = RocksimCommonConstants.CUSTOM_FIN_SET, type = CustomFinSetDTO.class),
+            @XmlElementRef(name = RocksimCommonConstants.RING, type = CenteringRingDTO.class),
+            @XmlElementRef(name = RocksimCommonConstants.STREAMER, type = StreamerDTO.class),
+            @XmlElementRef(name = RocksimCommonConstants.PARACHUTE, type = ParachuteDTO.class),
+            @XmlElementRef(name = RocksimCommonConstants.MASS_OBJECT, type = MassObjectDTO.class)})
     List<BasePartDTO> attachedParts = new ArrayList<BasePartDTO>();
 
     /**
@@ -74,13 +74,13 @@ public class AbstractTransitionDTO extends BasePartDTO {
             setShapeParameter(nc.getShapeParameter());
         }
 
-        setWallThickness(nc.getThickness() * RocksimHandler.ROCKSIM_TO_OPENROCKET_LENGTH);
+        setWallThickness(nc.getThickness() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
 
         List<RocketComponent> children = nc.getChildren();
         for (int i = 0; i < children.size(); i++) {
             RocketComponent rocketComponents = children.get(i);
             if (rocketComponents instanceof InnerTube) {
-                attachedParts.add(new InnerBodyTubeDTO((InnerTube) rocketComponents));
+                attachedParts.add(new InnerBodyTubeDTO((InnerTube) rocketComponents, this));
             } else if (rocketComponents instanceof BodyTube) {
                 attachedParts.add(new BodyTubeDTO((BodyTube) rocketComponents));
             } else if (rocketComponents instanceof Transition) {
@@ -136,4 +136,14 @@ public class AbstractTransitionDTO extends BasePartDTO {
     public void setShapeParameter(double theShapeParameter) {
         shapeParameter = theShapeParameter;
     }
+
+    @Override
+    public void addAttachedPart(BasePartDTO part) {
+        attachedParts.add(part);
+    }
+
+    @Override
+    public void removeAttachedPart(BasePartDTO part) {
+        attachedParts.remove(part);
+    }
 }