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 a4de3a9c8aeabcded7bc652c14c99b24539d0120..6ef65ed24b363f63a93787207dff33ed8f82df1e 100644 (file)
--- a/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
@@ -1,6 +1,8 @@
 package net.sf.openrocket.rocketcomponent;
 
 import net.sf.openrocket.l10n.Translator;
+import net.sf.openrocket.preset.ComponentPreset;
+import net.sf.openrocket.preset.ComponentPreset.Type;
 import net.sf.openrocket.startup.Application;
 
 /**
@@ -111,6 +113,18 @@ public class NoseCone extends Transition {
 
        /********** RocketComponent methods **********/
        
+       @Override
+       public Type getPresetType() {
+               return ComponentPreset.Type.NOSE_CONE;
+       }
+
+       @Override
+       protected void loadFromPreset(ComponentPreset preset) {
+               
+               //Many parameters are handled by the super class Transition.loadFromPreset
+               super.loadFromPreset(preset);
+       }
+
        /**
         * Return component name.
         */