component config refactoring, localization fixes
[debian/openrocket] / src / net / sf / openrocket / gui / configdialog / EllipticalFinSetConfig.java
index cfb70b35f95f8cc0869d0ec269a1ee328f2c335c..321ef6c42047a80050b46fdd96fab875bb4218d1 100644 (file)
@@ -9,6 +9,7 @@ import javax.swing.JSpinner;
 import javax.swing.SwingConstants;
 
 import net.miginfocom.swing.MigLayout;
+import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.gui.SpinnerEditor;
 import net.sf.openrocket.gui.adaptors.DoubleModel;
 import net.sf.openrocket.gui.adaptors.EnumModel;
@@ -24,43 +25,43 @@ import net.sf.openrocket.unit.UnitGroup;
 
 public class EllipticalFinSetConfig extends FinSetConfig {
        private static final Translator trans = Application.getTranslator();
-
-       public EllipticalFinSetConfig(final RocketComponent component) {
-               super(component);
-
+       
+       public EllipticalFinSetConfig(OpenRocketDocument d, final RocketComponent component) {
+               super(d, component);
+               
                DoubleModel m;
                JSpinner spin;
                JComboBox combo;
                
                JPanel mainPanel = new JPanel(new MigLayout());
                
-               
-               
-               JPanel panel = new JPanel(new MigLayout("gap rel unrel","[][65lp::][30lp::]",""));
+
+
+               JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
                
                ////  Number of fins
                panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Nbroffins")));
                
-               IntegerModel im = new IntegerModel(component,"FinCount",1,8);
+               IntegerModel im = new IntegerModel(component, "FinCount", 1, 8);
                
                spin = new JSpinner(im.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
-               panel.add(spin,"growx, wrap");
-               
+               panel.add(spin, "growx, wrap");
                
+
                ////  Base rotation
                panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Rotation")));
                
-               m = new DoubleModel(component, "BaseRotation", UnitGroup.UNITS_ANGLE,-Math.PI,Math.PI);
+               m = new DoubleModel(component, "BaseRotation", UnitGroup.UNITS_ANGLE, -Math.PI, Math.PI);
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
-               panel.add(spin,"growx");
-               
-               panel.add(new UnitSelector(m),"growx");
-               panel.add(new BasicSlider(m.getSliderModel(-Math.PI,Math.PI)),"w 100lp, wrap");
+               panel.add(spin, "growx");
                
+               panel.add(new UnitSelector(m), "growx");
+               panel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
                
+
                ////  Fin cant
                JLabel label = new JLabel(trans.get("EllipticalFinSetCfg.Fincant"));
                //// "The angle that the fins are canted with respect to the rocket
@@ -72,117 +73,117 @@ public class EllipticalFinSetConfig extends FinSetConfig {
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
-               panel.add(spin,"growx");
+               panel.add(spin, "growx");
                
-               panel.add(new UnitSelector(m),"growx");
-               panel.add(new BasicSlider(m.getSliderModel(-FinSet.MAX_CANT,FinSet.MAX_CANT)),
+               panel.add(new UnitSelector(m), "growx");
+               panel.add(new BasicSlider(m.getSliderModel(-FinSet.MAX_CANT, FinSet.MAX_CANT)),
                                "w 100lp, wrap");
                
 
-               
+
                ////  Root chord
                panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Rootchord")));
                
-               m  = new DoubleModel(component,"Length",UnitGroup.UNITS_LENGTH,0);
+               m = new DoubleModel(component, "Length", UnitGroup.UNITS_LENGTH, 0);
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
-               panel.add(spin,"growx");
+               panel.add(spin, "growx");
+               
+               panel.add(new UnitSelector(m), "growx");
+               panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
                
-               panel.add(new UnitSelector(m),"growx");
-               panel.add(new BasicSlider(m.getSliderModel(0,0.05,0.2)),"w 100lp, wrap");
-
 
                ////  Height
                panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Height")));
                
-               m = new DoubleModel(component,"Height",UnitGroup.UNITS_LENGTH,0);
+               m = new DoubleModel(component, "Height", UnitGroup.UNITS_LENGTH, 0);
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
-               panel.add(spin,"growx");
+               panel.add(spin, "growx");
                
-               panel.add(new UnitSelector(m),"growx");
-               panel.add(new BasicSlider(m.getSliderModel(0,0.05,0.2)),"w 100lp, wrap");
-       
+               panel.add(new UnitSelector(m), "growx");
+               panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
                
+
                ////  Position
                //// Position relative to:
                panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Positionrelativeto")));
-
+               
                combo = new JComboBox(
                                new EnumModel<RocketComponent.Position>(component, "RelativePosition",
                                                new RocketComponent.Position[] {
-                                               RocketComponent.Position.TOP,
-                                               RocketComponent.Position.MIDDLE,
-                                               RocketComponent.Position.BOTTOM,
-                                               RocketComponent.Position.ABSOLUTE
+                                                               RocketComponent.Position.TOP,
+                                                               RocketComponent.Position.MIDDLE,
+                                                               RocketComponent.Position.BOTTOM,
+                                                               RocketComponent.Position.ABSOLUTE
                                }));
-               panel.add(combo,"spanx, growx, wrap");
+               panel.add(combo, "spanx, growx, wrap");
                
                //// plus
-               panel.add(new JLabel(trans.get("EllipticalFinSetCfg.plus")),"right");
-
-               m = new DoubleModel(component,"PositionValue",UnitGroup.UNITS_LENGTH);
+               panel.add(new JLabel(trans.get("EllipticalFinSetCfg.plus")), "right");
+               
+               m = new DoubleModel(component, "PositionValue", UnitGroup.UNITS_LENGTH);
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
-               panel.add(spin,"growx");
+               panel.add(spin, "growx");
                
-               panel.add(new UnitSelector(m),"growx");
+               panel.add(new UnitSelector(m), "growx");
                panel.add(new BasicSlider(m.getSliderModel(
                                new DoubleModel(component.getParent(), "Length", -1.0, UnitGroup.UNITS_NONE),
                                new DoubleModel(component.getParent(), "Length"))),
                                "w 100lp, wrap");
+               
 
 
-               
                //// Right portion
-               mainPanel.add(panel,"aligny 20%");
+               mainPanel.add(panel, "aligny 20%");
                
-               mainPanel.add(new JSeparator(SwingConstants.VERTICAL),"growy");
+               mainPanel.add(new JSeparator(SwingConstants.VERTICAL), "growy");
                
-               
-               
-               panel = new JPanel(new MigLayout("gap rel unrel","[][65lp::][30lp::]",""));
 
 
+               panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
+               
+
                ////  Cross section
                //// Fin cross section:
-               panel.add(new JLabel(trans.get("EllipticalFinSetCfg.FincrossSection")),"span, split");
+               panel.add(new JLabel(trans.get("EllipticalFinSetCfg.FincrossSection")), "span, split");
                combo = new JComboBox(
-                               new EnumModel<FinSet.CrossSection>(component,"CrossSection"));
-               panel.add(combo,"growx, wrap unrel");
+                               new EnumModel<FinSet.CrossSection>(component, "CrossSection"));
+               panel.add(combo, "growx, wrap unrel");
                
 
                ////  Thickness:
                panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Thickness")));
                
-               m = new DoubleModel(component,"Thickness",UnitGroup.UNITS_LENGTH,0);
+               m = new DoubleModel(component, "Thickness", UnitGroup.UNITS_LENGTH, 0);
                
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
-               panel.add(spin,"growx");
-               
-               panel.add(new UnitSelector(m),"growx");
-               panel.add(new BasicSlider(m.getSliderModel(0,0.01)),"w 100lp, wrap 30lp");
+               panel.add(spin, "growx");
                
+               panel.add(new UnitSelector(m), "growx");
+               panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap 30lp");
                
 
+
                //// Material
                materialPanel(panel, Material.Type.BULK);
                
-               
-               
-               
-               
-               mainPanel.add(panel,"aligny 20%");
+
+
+
+
+               mainPanel.add(panel, "aligny 20%");
                
                addFinSetButtons();
-
+               
                //// General and General properties
-               tabbedPane.insertTab(trans.get("EllipticalFinSetCfg.General"), null, mainPanel, 
+               tabbedPane.insertTab(trans.get("EllipticalFinSetCfg.General"), null, mainPanel,
                                trans.get("EllipticalFinSetCfg.Generalproperties"), 0);
                tabbedPane.setSelectedIndex(0);
        }
-
+       
 }