From: Bill Kuker <bkuker@billkuker.com>
Date: Sat, 6 Nov 2010 19:08:40 +0000 (+0000)
Subject: Removed unused motor XML editor
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=06c37f59e05d8c3a7641dd985d6f8077c3c96621;p=sw%2Fmotorsim

Removed unused motor XML editor
---

diff --git a/.classpath b/.classpath
index 9bc0208..13efd5e 100644
--- a/.classpath
+++ b/.classpath
@@ -8,7 +8,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/gui/l2fprod-common-sheet.jar"/>
-	<classpathentry kind="lib" path="lib/gui/rsyntaxtextarea.jar"/>
 	<classpathentry kind="lib" path="lib/jscience.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
 	<classpathentry kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index b71748c..9bc1a44 100644
--- 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;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyVetoException;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -36,8 +35,6 @@ import javax.swing.UIManager;
 import javax.swing.WindowConstants;
 
 import org.apache.log4j.Logger;
-import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
-import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 import org.jscience.physics.amount.Amount;
 
 import com.billkuker.rocketry.motorsim.Burn;
@@ -59,7 +56,6 @@ import com.billkuker.rocketry.motorsim.grain.Moonburner;
 import com.billkuker.rocketry.motorsim.grain.MultiGrain;
 import com.billkuker.rocketry.motorsim.grain.RodAndTubeGrain;
 import com.billkuker.rocketry.motorsim.grain.Star;
-import com.billkuker.rocketry.motorsim.io.MotorIO;
 import com.billkuker.rocketry.motorsim.visual.BurnPanel;
 import com.billkuker.rocketry.motorsim.visual.Editor;
 import com.billkuker.rocketry.motorsim.visual.GrainPanel;
@@ -68,7 +64,6 @@ import com.billkuker.rocketry.motorsim.visual.HardwarePanel;
 public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
 	private static final long serialVersionUID = 1L;
 	private static Logger log = Logger.getLogger(MotorEditor.class);
-	RSyntaxTextArea text = new RSyntaxTextArea();
 	Motor motor;
 	GrainEditor grainEditor;
 	BurnTab bt;
@@ -332,40 +327,24 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
 		}
 	}
 
-	{
-		text.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_XML);
-
-	}
 
 	public MotorEditor(Motor m, Collection<Fuel> fuels) {
 		super(JTabbedPane.BOTTOM);
 		for ( Fuel f : fuels )
 			addFuel(f);
-		text.setName("XML");
-		text.setEditable(false);
-		//add(text, XML_TAB);
-		setMotor(m, true);
+		setMotor(m);
 	}
 
 	public Motor getMotor() {
 		return motor;
 	}
 
-	private void reText() {
-		try {
-			text.setText(MotorIO.writeMotor(motor));
-		} catch (IOException e) {
-			throw new Error(e);
-		}
-	}
 
-	private void setMotor(Motor m, boolean retext) {
+	private void setMotor(Motor m) {
 		if (motor != null)
 			motor.removePropertyChangeListener(this);
 		motor = m;
 		motor.addPropertyChangeListener(this);
-		if (retext)
-			reText();
 		if (grainEditor != null)
 			remove(grainEditor);
 		while (getTabCount() > 1)
@@ -437,7 +416,6 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
 	}
 
 	public void propertyChange(PropertyChangeEvent evt) {
-		reText();
 		// Dont re-burn for a name change!
 		if (!evt.getPropertyName().equals("Name")){
 			bt.reBurn();
diff --git a/lib/gui/rsyntaxtextarea.jar b/lib/gui/rsyntaxtextarea.jar
deleted file mode 100644
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 f573257..d328a44 100644
--- 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;
 	}
 	
-	public static String writeMotor(Motor m) throws IOException{
-		StringWriter sout = new StringWriter();
-		ObjectOutputStream out = getXStream().createObjectOutputStream(sout);
-		out.writeObject(m);
-		out.close();
-		sout.close();
-		return sout.toString();
-	}
-	
-	public static Motor readMotor(String s) throws IOException{
-		StringReader sin = new StringReader(s);
-		ObjectInputStream in = getXStream().createObjectInputStream(sin);
-		Motor m;
-		try {
-			m = (Motor)in.readObject();
-		} catch (ClassNotFoundException e) {
-			throw new IOException("Class not found", e);
-		}
-		return m;
-	}
 }