Removed unused motor XML editor

[sw/motorsim] / gui / com / billkuker / rocketry / motorsim / visual / workbench / MotorEditor.java

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index 988ad6c53a7c3349061b87a0432050a0e0f876d7..9bc1a4415f5d3fb526e1c1f76c1f2132598bcb12 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@ -9,7 +9,7 @@ import java.awt.event.FocusListener;
 import java.beans.PropertyChangeEvent;\r
 import java.beans.PropertyChangeListener;\r
 import java.beans.PropertyVetoException;\r
-import java.io.IOException;\r
+import java.util.Collection;\r
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
@@ -19,7 +19,7 @@ import javax.measure.quantity.Length;
 import javax.measure.unit.SI;\r
 import javax.swing.Box;\r
 import javax.swing.BoxLayout;\r
-import javax.swing.ComboBoxModel;\r
+import javax.swing.DefaultComboBoxModel;\r
 import javax.swing.JButton;\r
 import javax.swing.JComboBox;\r
 import javax.swing.JFrame;\r
@@ -35,8 +35,6 @@ import javax.swing.UIManager;
 import javax.swing.WindowConstants;\r
 \r
 import org.apache.log4j.Logger;\r
-import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;\r
-import org.fife.ui.rsyntaxtextarea.SyntaxConstants;\r
 import org.jscience.physics.amount.Amount;\r
 \r
 import com.billkuker.rocketry.motorsim.Burn;\r
@@ -58,7 +56,6 @@ import com.billkuker.rocketry.motorsim.grain.Moonburner;
 import com.billkuker.rocketry.motorsim.grain.MultiGrain;\r
 import com.billkuker.rocketry.motorsim.grain.RodAndTubeGrain;\r
 import com.billkuker.rocketry.motorsim.grain.Star;\r
-import com.billkuker.rocketry.motorsim.io.MotorIO;\r
 import com.billkuker.rocketry.motorsim.visual.BurnPanel;\r
 import com.billkuker.rocketry.motorsim.visual.Editor;\r
 import com.billkuker.rocketry.motorsim.visual.GrainPanel;\r
@@ -67,14 +64,17 @@ import com.billkuker.rocketry.motorsim.visual.HardwarePanel;
 public class MotorEditor extends JTabbedPane implements PropertyChangeListener {\r
        private static final long serialVersionUID = 1L;\r
        private static Logger log = Logger.getLogger(MotorEditor.class);\r
-       RSyntaxTextArea text = new RSyntaxTextArea();\r
        Motor motor;\r
        GrainEditor grainEditor;\r
        BurnTab bt;\r
        Burn burn;\r
 \r
        private Vector<BurnWatcher> burnWatchers = new Vector<BurnWatcher>();\r
-       private ComboBoxModel availableFuels;\r
+       private DefaultComboBoxModel availableFuels = new DefaultComboBoxModel();\r
+       \r
+       public void addFuel(Fuel f){\r
+               availableFuels.addElement(f);\r
+       }\r
 \r
        //private static final int XML_TAB = 0;\r
        private static final int CASING_TAB = 0;\r
@@ -327,39 +327,24 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
                }\r
        }\r
 \r
-       {\r
-               text.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_XML);\r
-\r
-       }\r
 \r
-       public MotorEditor(Motor m, ComboBoxModel fuels) {\r
+       public MotorEditor(Motor m, Collection<Fuel> fuels) {\r
                super(JTabbedPane.BOTTOM);\r
-               this.availableFuels = fuels;\r
-               text.setName("XML");\r
-               text.setEditable(false);\r
-               //add(text, XML_TAB);\r
-               setMotor(m, true);\r
+               for ( Fuel f : fuels )\r
+                       addFuel(f);\r
+               setMotor(m);\r
        }\r
 \r
        public Motor getMotor() {\r
                return motor;\r
        }\r
 \r
-       private void reText() {\r
-               try {\r
-                       text.setText(MotorIO.writeMotor(motor));\r
-               } catch (IOException e) {\r
-                       throw new Error(e);\r
-               }\r
-       }\r
 \r
-       private void setMotor(Motor m, boolean retext) {\r
+       private void setMotor(Motor m) {\r
                if (motor != null)\r
                        motor.removePropertyChangeListener(this);\r
                motor = m;\r
                motor.addPropertyChangeListener(this);\r
-               if (retext)\r
-                       reText();\r
                if (grainEditor != null)\r
                        remove(grainEditor);\r
                while (getTabCount() > 1)\r
@@ -431,7 +416,6 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
        }\r
 \r
        public void propertyChange(PropertyChangeEvent evt) {\r
-               reText();\r
                // Dont re-burn for a name change!\r
                if (!evt.getPropertyName().equals("Name")){\r
                        bt.reBurn();\r