Removed unused motor XML editor

diff --git a/.classpath b/.classpath
index 9bc0208e0d6be0945a0f7df72db43c20167cafa7..13efd5eff67ac31bb9e1d2d1b61d30ee61104b5d 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -8,7 +8,6 @@
        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>\r
        <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>\r
        <classpathentry kind="lib" path="lib/gui/l2fprod-common-sheet.jar"/>\r
-       <classpathentry kind="lib" path="lib/gui/rsyntaxtextarea.jar"/>\r
        <classpathentry kind="lib" path="lib/jscience.jar"/>\r
        <classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>\r
        <classpathentry kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>\r

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index b71748c09fb4441093abfd6d318a63abf0774748..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,6 @@ 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
@@ -36,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
@@ -59,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
@@ -68,7 +64,6 @@ 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
@@ -332,40 +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, Collection<Fuel> fuels) {\r
                super(JTabbedPane.BOTTOM);\r
                for ( Fuel f : fuels )\r
                        addFuel(f);\r
-               text.setName("XML");\r
-               text.setEditable(false);\r
-               //add(text, XML_TAB);\r
-               setMotor(m, true);\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
@@ -437,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

diff --git a/lib/gui/rsyntaxtextarea.jar b/lib/gui/rsyntaxtextarea.jar
deleted file mode 100644 (file)
index 88cb369..0000000
Binary files a/lib/gui/rsyntaxtextarea.jar and /dev/null differ

diff --git a/src/com/billkuker/rocketry/motorsim/io/MotorIO.java b/src/com/billkuker/rocketry/motorsim/io/MotorIO.java
index f5732574cf6205efd2437ba65995b0786bc130bf..d328a44d86c0f94d155686e760c0ad8c47ad3d4c 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/io/MotorIO.java
+++ b/src/com/billkuker/rocketry/motorsim/io/MotorIO.java
@@ -134,24 +134,4 @@ public class MotorIO {
                return m;\r
        }\r
        \r
-       public static String writeMotor(Motor m) throws IOException{\r
-               StringWriter sout = new StringWriter();\r
-               ObjectOutputStream out = getXStream().createObjectOutputStream(sout);\r
-               out.writeObject(m);\r
-               out.close();\r
-               sout.close();\r
-               return sout.toString();\r
-       }\r
-       \r
-       public static Motor readMotor(String s) throws IOException{\r
-               StringReader sin = new StringReader(s);\r
-               ObjectInputStream in = getXStream().createObjectInputStream(sin);\r
-               Motor m;\r
-               try {\r
-                       m = (Motor)in.readObject();\r
-               } catch (ClassNotFoundException e) {\r
-                       throw new IOException("Class not found", e);\r
-               }\r
-               return m;\r
-       }\r
 }\r