updates for 0.9.4

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

diff --git a/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java b/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java
index 951969e6abf28a273611d213758df4ae004bc9e9..02011b71f37a01f145e26a72c186c67e7386153d 100644 (file)
--- a/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java
+++ b/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java
@@ -12,13 +12,13 @@ import javax.swing.JPanel;
 import javax.swing.JSpinner;
 
 import net.miginfocom.swing.MigLayout;
-import net.sf.openrocket.gui.BasicSlider;
-import net.sf.openrocket.gui.ResizeLabel;
 import net.sf.openrocket.gui.SpinnerEditor;
-import net.sf.openrocket.gui.UnitSelector;
 import net.sf.openrocket.gui.adaptors.DoubleModel;
 import net.sf.openrocket.gui.adaptors.EnumModel;
 import net.sf.openrocket.gui.adaptors.MaterialModel;
+import net.sf.openrocket.gui.components.BasicSlider;
+import net.sf.openrocket.gui.components.ResizeLabel;
+import net.sf.openrocket.gui.components.UnitSelector;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.rocketcomponent.MassComponent;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
@@ -85,7 +85,8 @@ public class StreamerConfig extends RecoveryDeviceConfig {
                
                panel.add(new JLabel("Material:"));
                
-               JComboBox combo = new JComboBox(new MaterialModel(component, Material.Type.SURFACE));
+               JComboBox combo = new JComboBox(new MaterialModel(panel, component, 
+                               Material.Type.SURFACE));
                combo.setToolTipText("The component material affects the weight of the component.");
                panel.add(combo,"spanx 3, growx, wrap 20lp");