formatted

diff --git a/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index 369e44138df5a519cc30adf524f56e2bc214c276..4bd405bc94a67ea8cf6c0514d2f3be04c0ea9c09 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@ -65,7 +65,7 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
        GrainEditor grainEditor;\r
        BurnTab bt;\r
        Burn burn;\r
-       \r
+\r
        private Vector<BurnWatcher> burnWatchers = new Vector<BurnWatcher>();\r
 \r
        private static final int XML_TAB = 0;\r
@@ -111,6 +111,7 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
 \r
        private class BurnTab extends JPanel {\r
                private static final long serialVersionUID = 1L;\r
+\r
                public BurnTab() {\r
                        setLayout(new BorderLayout());\r
                        setName("Burn");\r
@@ -121,30 +122,31 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
                        removeAll();\r
                        new Thread() {\r
                                public void run() {\r
-                                       final JProgressBar bar = new JProgressBar(0,100);\r
+                                       final JProgressBar bar = new JProgressBar(0, 100);\r
                                        add(bar, BorderLayout.NORTH);\r
-                                       try{\r
-                                       final Burn b = new Burn(motor, new Burn.BurnProgressListener(){\r
-                                               @Override\r
-                                               public void setProgress(float f){\r
-                                                       bar.setValue((int)(f*100));\r
-                                               }\r
-                                       });\r
-                               \r
-                                       final BurnPanel bp = new BurnPanel(b);\r
-                                       SwingUtilities.invokeLater(new Thread() {\r
-                                               public void run() {\r
-                                                       remove(bar);\r
-                                                       add(bp, BorderLayout.CENTER);\r
-                                                       \r
-                                                       for( BurnWatcher bw : burnWatchers )\r
-                                                               bw.replace(burn, b);\r
-                                                       burn = b;\r
-                                                       \r
-                                                       revalidate();\r
-                                               }\r
-                                       });\r
-                                       } catch ( Exception e ){\r
+                                       try {\r
+                                               final Burn b = new Burn(motor,\r
+                                                               new Burn.BurnProgressListener() {\r
+                                                                       @Override\r
+                                                                       public void setProgress(float f) {\r
+                                                                               bar.setValue((int) (f * 100));\r
+                                                                       }\r
+                                                               });\r
+\r
+                                               final BurnPanel bp = new BurnPanel(b);\r
+                                               SwingUtilities.invokeLater(new Thread() {\r
+                                                       public void run() {\r
+                                                               remove(bar);\r
+                                                               add(bp, BorderLayout.CENTER);\r
+\r
+                                                               for (BurnWatcher bw : burnWatchers)\r
+                                                                       bw.replace(burn, b);\r
+                                                               burn = b;\r
+\r
+                                                               revalidate();\r
+                                                       }\r
+                                               });\r
+                                       } catch (Exception e) {\r
                                                remove(bar);\r
                                                JTextArea t = new JTextArea(e.getMessage());\r
                                                t.setEditable(false);\r
@@ -196,7 +198,8 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
                        // setDividerLocation(.25);\r
                        // setResizeWeight(.25);\r
                        if (g instanceof ChangeListening.Subject) {\r
-                               ((ChangeListening.Subject) g).addPropertyChangeListener(MotorEditor.this);\r
+                               ((ChangeListening.Subject) g)\r
+                                               .addPropertyChangeListener(MotorEditor.this);\r
                        }\r
                }\r
        }\r
@@ -223,6 +226,7 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
 \r
                        p.add(new Chooser<Fuel>(fuelTypes) {\r
                                private static final long serialVersionUID = 1L;\r
+\r
                                @Override\r
                                protected void choiceMade(Fuel o) {\r
                                        motor.setFuel(o);\r
@@ -244,7 +248,8 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
                        // setDividerLocation(.25);\r
                        // setResizeWeight(.25);\r
                        if (f instanceof ChangeListening.Subject) {\r
-                               ((ChangeListening.Subject) f).addPropertyChangeListener(MotorEditor.this);\r
+                               ((ChangeListening.Subject) f)\r
+                                               .addPropertyChangeListener(MotorEditor.this);\r
                        }\r
                }\r
        }\r
@@ -260,40 +265,42 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
                        setLeftComponent(parts);\r
                        setRightComponent(new NozzlePanel(n));\r
 \r
-                       parts.add(new JTextField(motor.getName()){\r
+                       parts.add(new JTextField(motor.getName()) {\r
                                private static final long serialVersionUID = 1L;\r
                                {\r
                                        final JTextField t = this;\r
                                        addFocusListener(new FocusListener() {\r
-                                               \r
+\r
                                                @Override\r
                                                public void focusLost(FocusEvent e) {\r
                                                        String n = t.getText();\r
-                                                       if ( !"".equals(n) && !n.equals(motor.getName()) ){\r
+                                                       if (!"".equals(n) && !n.equals(motor.getName())) {\r
                                                                System.out.println("Name Changed");\r
                                                                motor.setName(n);\r
                                                        } else {\r
                                                                t.setText(motor.getName());\r
                                                        }\r
                                                }\r
-                                               \r
+\r
                                                @Override\r
                                                public void focusGained(FocusEvent e) {\r
-                                               \r
+\r
                                                }\r
                                        });\r
-                                       \r
+\r
                                }\r
                        });\r
-                       \r
+\r
                        parts.add(new Editor(c));\r
                        parts.add(new Editor(n));\r
 \r
                        if (n instanceof ChangeListening.Subject) {\r
-                               ((ChangeListening.Subject) n).addPropertyChangeListener(MotorEditor.this);\r
+                               ((ChangeListening.Subject) n)\r
+                                               .addPropertyChangeListener(MotorEditor.this);\r
                        }\r
                        if (c instanceof ChangeListening.Subject) {\r
-                               ((ChangeListening.Subject) c).addPropertyChangeListener(MotorEditor.this);\r
+                               ((ChangeListening.Subject) c)\r
+                                               .addPropertyChangeListener(MotorEditor.this);\r
                        }\r
                }\r
        }\r
@@ -310,8 +317,8 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
                add(text, XML_TAB);\r
                setMotor(m, true);\r
        }\r
-       \r
-       public Motor getMotor(){\r
+\r
+       public Motor getMotor() {\r
                return motor;\r
        }\r
 \r
@@ -324,7 +331,7 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
        }\r
 \r
        private void setMotor(Motor m, boolean retext) {\r
-               if ( motor != null )\r
+               if (motor != null)\r
                        motor.removePropertyChangeListener(this);\r
                motor = m;\r
                motor.addPropertyChangeListener(this);\r
@@ -379,8 +386,8 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
                if (o instanceof Fuel || o instanceof Fuel.CombustionProduct)\r
                        setSelectedIndex(FUEL_TAB);\r
        }\r
-       \r
-       public void addBurnWatcher(BurnWatcher bw){\r
+\r
+       public void addBurnWatcher(BurnWatcher bw) {\r
                burnWatchers.add(bw);\r
        }\r
 \r
@@ -404,8 +411,8 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
 \r
        public void propertyChange(PropertyChangeEvent evt) {\r
                reText();\r
-               //Dont re-burn for a name change!\r
-               if ( !evt.getPropertyName().equals("Name") )\r
+               // Dont re-burn for a name change!\r
+               if (!evt.getPropertyName().equals("Name"))\r
                        bt.reBurn();\r
        }\r
 \r