component config refactoring, localization fixes

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

diff --git a/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java b/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java
index 0a21fc4c797a504e257b73e47f64734f69bc010a..fbc99f853d44941011681e0f78c2f948ca2098ca 100644 (file)
--- a/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java
+++ b/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java
@@ -7,6 +7,7 @@ import javax.swing.JPanel;
 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.DoubleModel;
 import net.sf.openrocket.gui.adaptors.EnumModel;
@@ -20,17 +21,17 @@ import net.sf.openrocket.unit.UnitGroup;
 
 public class ShockCordConfig extends RocketComponentConfig {
        private static final Translator trans = Application.getTranslator();
-
-       public ShockCordConfig(RocketComponent component) {
-               super(component);
+       
+       public ShockCordConfig(OpenRocketDocument d, RocketComponent component) {
+               super(d, component);
                
-               JPanel panel = new JPanel(new MigLayout("gap rel unrel","[][65lp::][30lp::]",""));
+               JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
                JLabel label;
                DoubleModel m;
                JSpinner spin;
                String tip;
                
-               
+
                //////  Left side
                
                // Cord length
@@ -38,14 +39,14 @@ public class ShockCordConfig extends RocketComponentConfig {
                label = new JLabel(trans.get("ShockCordCfg.lbl.Shockcordlength"));
                panel.add(label);
                
-               m = new DoubleModel(component,"CordLength",UnitGroup.UNITS_LENGTH,0);
+               m = new DoubleModel(component, "CordLength", 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, 1, 10)),"w 100lp, wrap");
+               panel.add(new UnitSelector(m), "growx");
+               panel.add(new BasicSlider(m.getSliderModel(0, 1, 10)), "w 100lp, wrap");
                
 
                // Material
@@ -53,77 +54,77 @@ public class ShockCordConfig extends RocketComponentConfig {
                materialPanel(panel, Material.Type.LINE, trans.get("ShockCordCfg.lbl.Shockcordmaterial"), null);
                
 
-               
+
                /////  Right side
-               JPanel panel2 = new JPanel(new MigLayout("gap rel unrel","[][65lp::][30lp::]",""));
+               JPanel panel2 = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
                panel.add(panel2, "cell 4 0, gapleft paragraph, aligny 0%, spany");
                
-               
+
                ////  Position
                //// Position relative to:
                panel2.add(new JLabel(trans.get("ShockCordCfg.lbl.Posrelativeto")));
-
+               
                JComboBox 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
                                }));
-               panel2.add(combo,"spanx, growx, wrap");
+               panel2.add(combo, "spanx, growx, wrap");
                
                //// plus
-               panel2.add(new JLabel(trans.get("ShockCordCfg.lbl.plus")),"right");
-
-               m = new DoubleModel(component,"PositionValue",UnitGroup.UNITS_LENGTH);
+               panel2.add(new JLabel(trans.get("ShockCordCfg.lbl.plus")), "right");
+               
+               m = new DoubleModel(component, "PositionValue", UnitGroup.UNITS_LENGTH);
                spin = new JSpinner(m.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
-               panel2.add(spin,"growx");
+               panel2.add(spin, "growx");
                
-               panel2.add(new UnitSelector(m),"growx");
+               panel2.add(new UnitSelector(m), "growx");
                panel2.add(new BasicSlider(m.getSliderModel(
                                new DoubleModel(component.getParent(), "Length", -1.0, UnitGroup.UNITS_NONE),
                                new DoubleModel(component.getParent(), "Length"))),
                                "w 100lp, wrap");
-
+               
 
                ////  Spatial length
                //// Packed length:
                panel2.add(new JLabel(trans.get("ShockCordCfg.lbl.Packedlength")));
                
-               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));
-               panel2.add(spin,"growx");
-               
-               panel2.add(new UnitSelector(m),"growx");
-               panel2.add(new BasicSlider(m.getSliderModel(0, 0.1, 0.5)),"w 100lp, wrap");
+               panel2.add(spin, "growx");
                
+               panel2.add(new UnitSelector(m), "growx");
+               panel2.add(new BasicSlider(m.getSliderModel(0, 0.1, 0.5)), "w 100lp, wrap");
                
+
                //// Tube diameter
                //// Packed diameter:
                panel2.add(new JLabel(trans.get("ShockCordCfg.lbl.Packeddiam")));
-
-               DoubleModel od  = new DoubleModel(component,"Radius",2,UnitGroup.UNITS_LENGTH,0);
+               
+               DoubleModel od = new DoubleModel(component, "Radius", 2, UnitGroup.UNITS_LENGTH, 0);
                // Diameter = 2*Radius
-
+               
                spin = new JSpinner(od.getSpinnerModel());
                spin.setEditor(new SpinnerEditor(spin));
-               panel2.add(spin,"growx");
-               
-               panel2.add(new UnitSelector(od),"growx");
-               panel2.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)),"w 100lp, wrap");
-
+               panel2.add(spin, "growx");
                
+               panel2.add(new UnitSelector(od), "growx");
+               panel2.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap");
                
+
+
                //// General and General properties
                tabbedPane.insertTab(trans.get("ShockCordCfg.tab.General"), null, panel, trans.get("ShockCordCfg.tab.ttip.General"), 0);
-//             tabbedPane.insertTab("Radial position", null, positionTab(), 
-//                             "Radial position configuration", 1);
+               //              tabbedPane.insertTab("Radial position", null, positionTab(), 
+               //                              "Radial position configuration", 1);
                tabbedPane.setSelectedIndex(0);
        }
        
-       
+
 }