bug fixes

[debian/openrocket] / src / net / sf / openrocket / rocketcomponent / ExternalComponent.java

diff --git a/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java b/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java
index 23cea24074368f56983fd6fa6e20a2e8b8f122ab..e710cb2773d288a14b915e9335112a117a76bfb4 100644 (file)
--- a/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java
+++ b/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java
@@ -5,8 +5,6 @@ import java.util.List;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.material.Material.Type;
-import net.sf.openrocket.preset.ExternalComponentPreset;
-import net.sf.openrocket.preset.RocketComponentPreset;
 import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.Prefs;
@@ -116,6 +114,7 @@ public abstract class ExternalComponent extends RocketComponent {
                material = mat;
                clearPreset();
                fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE);
+               clearPreset();
        }
        
        public Finish getFinish() {
@@ -131,22 +130,26 @@ public abstract class ExternalComponent extends RocketComponent {
        
        
        @Override
-       protected void loadFromPreset(RocketComponentPreset preset) {
+       protected void loadFromPreset(RocketComponent preset) {
                super.loadFromPreset(preset);
                
-               ExternalComponentPreset p = (ExternalComponentPreset) preset;
-               String materialName = p.getMaterialName();
-               double mass = p.getMass();
+               // Surface finish is left unchanged
+               
+               ExternalComponent c = (ExternalComponent) preset;
                
-               double volume = getComponentVolume();
-               double density;
-               if (volume > 0.00001) {
-                       density = mass / volume;
-               } else {
-                       density = 1000;
+               Material mat = c.getMaterial();
+               if (c.isMassOverridden()) {
+                       double mass = c.getOverrideMass();
+                       double volume = getComponentVolume();
+                       double density;
+                       if (volume > 0.00001) {
+                               density = mass / volume;
+                       } else {
+                               density = 1000;
+                       }
+                       mat = Material.newMaterial(Type.BULK, mat.getName(), density, true);
                }
                
-               Material mat = Material.newMaterial(Type.BULK, materialName, density, true);
                setMaterial(mat);
        }