Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

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

diff --git a/core/src/net/sf/openrocket/rocketcomponent/Bulkhead.java b/core/src/net/sf/openrocket/rocketcomponent/Bulkhead.java
index 24a1552ffd24460a36b2f54441d7a0828a9fded7..36822c4d0b6a6fe78de7b817761710f7160888a6 100644 (file)
--- a/core/src/net/sf/openrocket/rocketcomponent/Bulkhead.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/Bulkhead.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;
 
 
@@ -12,6 +14,11 @@ public class Bulkhead extends RadiusRingComponent {
                setLength(0.002);
        }
        
+       @Override
+       public Type getPresetType() {
+               return ComponentPreset.Type.BULK_HEAD;
+       }
+
        @Override
        public double getInnerRadius() {
                return 0;
@@ -25,6 +32,7 @@ public class Bulkhead extends RadiusRingComponent {
        @Override
        public void setOuterRadiusAutomatic(boolean auto) {
                super.setOuterRadiusAutomatic(auto);
+               clearPreset();
        }
        
        @Override