X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fconfigdialog%2FBodyTubeConfig.java;h=b6ff3bdd42bfdeb3e98b5c27b7df8f00ecd95d35;hb=4095cb0dd61a75b7b6b0bd811f8e803af5b27919;hp=b026a45544876ca3c7eeb5e8a7983a234e9aacb5;hpb=86841bc30de6a0707bc67b87cff057d005be595d;p=debian%2Fopenrocket

diff --git a/core/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java b/core/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java
index b026a455..b6ff3bdd 100644
--- a/core/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java
+++ b/core/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java
@@ -8,28 +8,25 @@ import javax.swing.JPanel;
 import javax.swing.JSpinner;
 
 import net.miginfocom.swing.MigLayout;
+import net.sf.openrocket.database.ComponentPresetDatabase;
 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) {
@@ -37,10 +34,7 @@ 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")) );
-		presetComboBox = new JComboBox(new BodyTubePresetModel(component));
-		panel.add(presetComboBox, "wrap");
+
 
 		////  Body tube length
 		panel.add(new JLabel(trans.get("BodyTubecfg.lbl.Bodytubelength")));
@@ -121,18 +115,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...
-		adjustPresetState();
-
-		listener = new ComponentChangeListener() {
-
-			@Override
-			public void componentChanged(ComponentChangeEvent e) {
-				adjustPresetState();
-			}
-
-		};
-		component.addChangeListener(listener);
 
 	}
 
@@ -143,24 +125,4 @@ public class BodyTubeConfig extends RocketComponentConfig {
 			motorConfigPane.updateFields();
 	}
 
-	@Override
-	public void invalidateModels() {
-		super.invalidateModels();
-		component.removeChangeListener(listener);
-	}
-
-	private void adjustPresetState() {
-		BodyTube bt = (BodyTube) component;
-		if ( bt.getPresetComponent() != null ) {
-			BodyTube btPreset = (BodyTube) bt.getPresetComponent().getPrototype();
-			maxLength.setValue( btPreset.getLength() );
-		} else {
-			// here we should be able to force the preset combo box to display empty.
-			// We set the selected index to -1 (undefined), then force a repaint.
-			presetComboBox.setSelectedIndex(-1);
-			presetComboBox.repaint();
-			maxLength.setValue(2.0);
-		}
-	}
-
 }