Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / src / net / sf / openrocket / rocketcomponent / BodyTube.java

diff --git a/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java b/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
index 8485c3fefe54e61c6d6ae0df8956679b06b7a0ce..65317a3c2f6c79a19b24a3caab32dc18f5cdfde7 100644 (file)
--- a/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
@@ -63,6 +63,11 @@ public class BodyTube extends SymmetricComponent implements MotorMount, Coaxial
        
        /************  Get/set component parameter methods ************/
        
+       @Override
+       public ComponentPreset.Type getPresetType() {
+               return ComponentPreset.Type.BODY_TUBE;
+       }
+
        /**
         * Return the outer radius of the body tube.
         *
@@ -137,10 +142,10 @@ public class BodyTube extends SymmetricComponent implements MotorMount, Coaxial
        @Override
        protected void loadFromPreset(ComponentPreset preset) {
                this.autoRadius = false;
-               if ( preset.containsKey(ComponentPreset.OUTER_DIAMETER) )  {
+               if ( preset.has(ComponentPreset.OUTER_DIAMETER) )  {
                        double outerDiameter = preset.get(ComponentPreset.OUTER_DIAMETER);
                        this.outerRadius = outerDiameter/2.0;
-                       if ( preset.containsKey(ComponentPreset.INNER_DIAMETER) ) {
+                       if ( preset.has(ComponentPreset.INNER_DIAMETER) ) {
                                double innerDiameter = preset.get(ComponentPreset.INNER_DIAMETER);
                                this.thickness = (outerDiameter-innerDiameter) / 2.0;
                        }
@@ -149,8 +154,8 @@ public class BodyTube extends SymmetricComponent implements MotorMount, Coaxial
                super.loadFromPreset(preset);
 
                fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
-               
        }
+       
        @Override
        public double getAftRadius() {
                return getOuterRadius();