Updates and fixed to preset handling

[debian/openrocket] / core / src / net / sf / openrocket / gui / configdialog / BodyTubeConfig.java

diff --git a/core/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java b/core/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java
index ffed6e73829f7edbd71cf713f58f9d07ef47002e..190b496899c74409b00d0405c3f014201a7e82c7 100644 (file)
--- a/core/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java
+++ b/core/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java
@@ -10,24 +10,23 @@ import javax.swing.JSpinner;
 import net.miginfocom.swing.MigLayout;
 import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.gui.SpinnerEditor;
-import net.sf.openrocket.gui.adaptors.BodyTubePresetModel;
 import net.sf.openrocket.gui.adaptors.BooleanModel;
 import net.sf.openrocket.gui.adaptors.DoubleModel;
+import net.sf.openrocket.gui.adaptors.PresetModel;
 import net.sf.openrocket.gui.components.BasicSlider;
 import net.sf.openrocket.gui.components.UnitSelector;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.rocketcomponent.BodyTube;
-import net.sf.openrocket.rocketcomponent.ComponentChangeEvent;
-import net.sf.openrocket.rocketcomponent.ComponentChangeListener;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
 import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.unit.UnitGroup;
 
 public class BodyTubeConfig extends RocketComponentConfig {
        
-       private ComponentChangeListener listener;
        private MotorConfig motorConfigPane = null;
+       private DoubleModel maxLength;
+       private JComboBox presetComboBox;
        private static final Translator trans = Application.getTranslator();
        
        public BodyTubeConfig(OpenRocketDocument d, RocketComponent c) {
@@ -35,17 +34,21 @@ public class BodyTubeConfig extends RocketComponentConfig {
                
                JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::][]", ""));
                
+               
+               
                ////  Body tube template
-               panel.add( new JLabel(trans.get("BodyTubecfg.lbl.Bodytubepreset")) );
-               {
-               JComboBox combo = new JComboBox(new BodyTubePresetModel(component));
-               panel.add(combo, "wrap");
-               }
+               // FIXME: Move to proper location
+               panel.add(new JLabel());
+               presetComboBox = new JComboBox(new PresetModel(component));
+               presetComboBox.setEditable(false);
+               panel.add(presetComboBox, "wrap para");
+               
+               
                
                ////  Body tube length
                panel.add(new JLabel(trans.get("BodyTubecfg.lbl.Bodytubelength")));
                
-               final DoubleModel maxLength = new DoubleModel(2.0);
+               maxLength = new DoubleModel(2.0);
                DoubleModel length = new DoubleModel(component, "Length", UnitGroup.UNITS_LENGTH, 0);
                
                JSpinner spin = new JSpinner(length.getSpinnerModel());
@@ -55,7 +58,7 @@ public class BodyTubeConfig extends RocketComponentConfig {
                panel.add(new UnitSelector(length), "growx");
                panel.add(new BasicSlider(length.getSliderModel(0, 0.5, maxLength)), "w 100lp, wrap");
                
-
+               
                //// Body tube diameter
                panel.add(new JLabel(trans.get("BodyTubecfg.lbl.Outerdiameter")));
                
@@ -74,14 +77,14 @@ public class BodyTubeConfig extends RocketComponentConfig {
                check.setText(trans.get("BodyTubecfg.checkbox.Automatic"));
                panel.add(check, "skip, span 2, wrap");
                
-
+               
                ////  Inner diameter
                panel.add(new JLabel(trans.get("BodyTubecfg.lbl.Innerdiameter")));
                
                // Diameter = 2*Radius
                DoubleModel m = new DoubleModel(component, "InnerRadius", 2, UnitGroup.UNITS_LENGTH, 0);
                
-
+               
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
                panel.add(spin, "growx");
@@ -89,7 +92,7 @@ public class BodyTubeConfig extends RocketComponentConfig {
                panel.add(new UnitSelector(m), "growx");
                panel.add(new BasicSlider(m.getSliderModel(new DoubleModel(0), od)), "w 100lp, wrap");
                
-
+               
                ////  Wall thickness
                panel.add(new JLabel(trans.get("BodyTubecfg.lbl.Wallthickness")));
                
@@ -107,7 +110,7 @@ public class BodyTubeConfig extends RocketComponentConfig {
                check.setText(trans.get("BodyTubecfg.checkbox.Filled"));
                panel.add(check, "skip, span 2, wrap");
                
-
+               
                //// Material
                panel.add(materialPanel(new JPanel(new MigLayout()), Material.Type.BULK),
                                "cell 4 0, gapleft paragraph, aligny 0%, spany");
@@ -121,27 +124,6 @@ public class BodyTubeConfig extends RocketComponentConfig {
                                trans.get("BodyTubecfg.tab.Motormountconf"), 1);
                tabbedPane.setSelectedIndex(0);
                
-               // need to work in the max length for body tubes based on presets...
-               BodyTube bt = (BodyTube) component;
-               if ( bt.getPresetComponent() != null ) {
-                       BodyTube btPreset = (BodyTube) bt.getPresetComponent().getPrototype();
-                       maxLength.setValue( btPreset.getLength() );
-               }
-
-               listener = new ComponentChangeListener() {
-
-                       @Override
-                       public void componentChanged(ComponentChangeEvent e) {
-                               BodyTube bt = (BodyTube) component;
-                               if ( bt.getPresetComponent() != null ) {
-                                       BodyTube btPreset = (BodyTube) bt.getPresetComponent().getPrototype();
-                                       maxLength.setValue(btPreset.getLength());
-                               }
-                               
-                       }
-                       
-               };
-               component.addChangeListener(listener);
                
        }
        
@@ -151,11 +133,7 @@ public class BodyTubeConfig extends RocketComponentConfig {
                if (motorConfigPane != null)
                        motorConfigPane.updateFields();
        }
-
-       @Override
-       public void invalidateModels() {
-               super.invalidateModels();
-               component.removeChangeListener(listener);
-       }
+       
+       
        
 }