Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

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

diff --git a/core/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java b/core/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java
index 682f6d3507b44b30229481791037bb4a0037e798..b1b8d55a2d4349418ccf9079bb966c5af97ac663 100644 (file)
--- a/core/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java
+++ b/core/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java
@@ -12,10 +12,12 @@ import javax.swing.JSlider;
 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.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.DescriptionArea;
 import net.sf.openrocket.gui.components.UnitSelector;
@@ -47,9 +49,6 @@ public class NoseConeConfig extends RocketComponentConfig {
                DoubleModel m;
                JPanel panel = new JPanel(new MigLayout("", "[][65lp::][30lp::]"));
                
-
-
-
                ////  Shape selection
                //// Nose cone shape:
                panel.add(new JLabel(trans.get("NoseConeCfg.lbl.Noseconeshape")));