Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

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

diff --git a/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java b/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
index 8b621c2f9c5d48e25cc7d52578de008f3d2583d7..6ef65ed24b363f63a93787207dff33ed8f82df1e 100644 (file)
--- a/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
@@ -120,27 +120,9 @@ public class NoseCone extends Transition {
 
        @Override
        protected void loadFromPreset(ComponentPreset preset) {
-               if ( preset.has(ComponentPreset.SHAPE) ) {
-                       Shape s = preset.get(ComponentPreset.SHAPE);
-                       this.setType(s);
-               }
-               if ( preset.has(ComponentPreset.OUTER_DIAMETER) )  {
-                       double outerDiameter = preset.get(ComponentPreset.OUTER_DIAMETER);
-                       this.setAftRadiusAutomatic(false);
-                       this.setAftRadius(outerDiameter/2.0);
-               }
-               if ( preset.has(ComponentPreset.SHOULDER_LENGTH) ) {
-                       double length = preset.get(ComponentPreset.SHOULDER_LENGTH);
-                       this.setAftShoulderLength(length);
-               }
-               if ( preset.has(ComponentPreset.SHOULDER_DIAMETER) ) {
-                       double d = preset.get(ComponentPreset.SHOULDER_DIAMETER);
-                       this.setAftShoulderRadius(d/2.0);
-               }
-
+               
+               //Many parameters are handled by the super class Transition.loadFromPreset
                super.loadFromPreset(preset);
-
-               fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
        }
 
        /**