Fixed JLabel layouts

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index be9f10adcc371c9fe97ecf64b0577bf90116b9ec..4005c6420d0ca033aa32fd4b7523a35814c9d69f 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@ -171,13 +171,21 @@ public class MotorEditor extends JPanel implements PropertyChangeListener {
                        if (g instanceof Grain.Composite) {\r
                                final JPanel p = new JPanel();\r
                                p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));\r
-                               p.add(new Editor(g));\r
+                               \r
+                               Editor grainEditor = new Editor(g);\r
+                               grainEditor.setAlignmentX(LEFT_ALIGNMENT);\r
+                               p.add(grainEditor);\r
+                               \r
                                for (Grain gg : ((Grain.Composite) g).getGrains()) {\r
                                        final int grainEditorIndex = p.getComponentCount() + 2;\r
-                                       p.add(new JLabel("Grain Type:"));\r
+                                       \r
+                                       JLabel l = new JLabel("Grain Type:");\r
+                                       l.setAlignmentX(LEFT_ALIGNMENT);\r
+                                       p.add(l);\r
+                                       \r
                                        p.add(new ClassChooser<Grain>(grainTypes, gg) {\r
                                                private static final long serialVersionUID = 1L;\r
-\r
+                                               {setAlignmentX(LEFT_ALIGNMENT);}\r
                                                @Override\r
                                                protected Grain classSelected(\r
                                                                Class<? extends Grain> clazz, Grain ng) {\r
@@ -201,7 +209,11 @@ public class MotorEditor extends JPanel implements PropertyChangeListener {
 \r
                                                }\r
                                        });\r
-                                       p.add(new Editor(gg));\r
+                                       \r
+                                       Editor ggEditor = new Editor(gg);\r
+                                       ggEditor.setAlignmentX(LEFT_ALIGNMENT);\r
+                                       p.add(ggEditor);\r
+                                       \r
                                        if (gg instanceof ChangeListening.Subject) {\r
                                                ((ChangeListening.Subject) gg)\r
                                                                .addPropertyChangeListener(MotorEditor.this);\r
@@ -232,10 +244,16 @@ public class MotorEditor extends JPanel implements PropertyChangeListener {
                private void setup() {\r
                        if (casingEditor != null)\r
                                casing.remove(casingEditor);\r
-                       casing.add(casingEditor = new Editor(motor.getChamber()));\r
+                       casingEditor = new Editor(motor.getChamber());\r
+                       casingEditor.setAlignmentX(LEFT_ALIGNMENT);\r
+                       casing.add(casingEditor);\r
+                       \r
                        if (nozzleEditor != null)\r
                                nozzle.remove(nozzleEditor);\r
-                       nozzle.add(nozzleEditor = new Editor(motor.getNozzle()));\r
+                       nozzleEditor = new Editor(motor.getNozzle());\r
+                       nozzleEditor.setAlignmentX(LEFT_ALIGNMENT);\r
+                       nozzle.add(nozzleEditor);\r
+                       \r
                        if (hp != null)\r
                                remove(hp);\r
                        setBottomComponent(hp = new HardwarePanel(motor.getNozzle(),\r
@@ -262,10 +280,13 @@ public class MotorEditor extends JPanel implements PropertyChangeListener {
                        JPanel nameAndFuel = new JPanel();\r
                        nameAndFuel.setLayout(new BoxLayout(nameAndFuel, BoxLayout.Y_AXIS));\r
 \r
-                       nameAndFuel.add(new JLabel("Name:"));\r
+                       JLabel l = new JLabel("Name:");\r
+                       l.setAlignmentX(LEFT_ALIGNMENT);\r
+                       nameAndFuel.add(l);\r
                        nameAndFuel.add(new JTextField(motor.getName()) {\r
                                private static final long serialVersionUID = 1L;\r
                                {\r
+                                       setAlignmentX(LEFT_ALIGNMENT);\r
                                        setMinimumSize(new Dimension(200, 20));\r
                                        setMaximumSize(new Dimension(Short.MAX_VALUE, 20));\r
                                        final JTextField t = this;\r
@@ -290,10 +311,14 @@ public class MotorEditor extends JPanel implements PropertyChangeListener {
                                }\r
                        });\r
                        \r
-                       nameAndFuel.add(new JLabel("Fuel:"));\r
+                       l = new JLabel("Fuel:");\r
+                       l.setAlignmentX(LEFT_ALIGNMENT);\r
+                       nameAndFuel.add(l);\r
+                       \r
                        nameAndFuel.add( new JComboBox(availableFuels){\r
                                private static final long serialVersionUID = 1L;\r
                                {\r
+                                       setAlignmentX(LEFT_ALIGNMENT);\r
                                        this.setSelectedItem(motor.getFuel());\r
                                        setMinimumSize(new Dimension(200, 20));\r
                                        setMaximumSize(new Dimension(Short.MAX_VALUE, 20));\r
@@ -306,10 +331,14 @@ public class MotorEditor extends JPanel implements PropertyChangeListener {
                                }\r
                        });\r
                        \r
-                       nameAndFuel.add(new JLabel("Casing:"));\r
+                       l = new JLabel("Casing:");\r
+                       l.setAlignmentX(LEFT_ALIGNMENT);\r
+                       nameAndFuel.add(l);\r
+                       \r
                        nameAndFuel.add(new ClassChooser<Chamber>(chamberTypes, motor.getChamber()) {\r
                                private static final long serialVersionUID = 1L;\r
                                {\r
+                                       setAlignmentX(LEFT_ALIGNMENT);\r
                                        setMinimumSize(new Dimension(200, 20));\r
                                        setMaximumSize(new Dimension(Short.MAX_VALUE, 20));\r
                                }\r
@@ -339,12 +368,16 @@ public class MotorEditor extends JPanel implements PropertyChangeListener {
                        \r
                        casing = new JPanel();\r
                        casing.setLayout(new BoxLayout(casing, BoxLayout.Y_AXIS));\r
-                       casing.add(new JLabel("Casing:"));\r
+                       l = new JLabel("Casing:");\r
+                       l.setAlignmentX(LEFT_ALIGNMENT);\r
+                       casing.add(l);\r
                        parts.add(casing);\r
                        \r
                        nozzle = new JPanel();\r
                        nozzle.setLayout(new BoxLayout(nozzle, BoxLayout.Y_AXIS));\r
-                       nozzle.add(new JLabel("Nozzle:"));\r
+                       l = new JLabel("Nozzle:");\r
+                       l.setAlignmentX(LEFT_ALIGNMENT);\r
+                       nozzle.add(l);\r
                        parts.add(nozzle);\r
                        \r
                        motor.addPropertyChangeListener(new PropertyChangeListener() {\r