From 0ca2cf5535cb59f6720622e85679b9dc018e8ef7 Mon Sep 17 00:00:00 2001
From: Bill Kuker <bkuker@billkuker.com>
Date: Wed, 18 Apr 2012 16:45:42 +0000
Subject: [PATCH] Updates to keep up with rocksim. MotorDB Broken

---
 .../visual/openRocket/RocketSimTable.java     | 11 +++--
 .../visual/workbench/MotorsEditor.java        |  4 +-
 peter.xml                                     | 42 +++++++++++++++++++
 3 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 peter.xml

diff --git a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java
index 7945371..b8cc0a6 100644
--- a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java
+++ b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java
@@ -6,6 +6,8 @@ import java.awt.Component;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -23,8 +25,9 @@ import javax.swing.table.DefaultTableCellRenderer;
 import net.sf.openrocket.aerodynamics.Warning;
 import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.document.Simulation;
+import net.sf.openrocket.file.DatabaseMotorFinder;
 import net.sf.openrocket.file.RocketLoadException;
-import net.sf.openrocket.file.openrocket.OpenRocketLoader;
+import net.sf.openrocket.file.openrocket.importt.OpenRocketLoader;
 import net.sf.openrocket.gui.plot.PlotConfiguration;
 import net.sf.openrocket.gui.plot.SimulationPlotDialog;
 import net.sf.openrocket.gui.util.SwingPreferences;
@@ -51,7 +54,7 @@ public class RocketSimTable extends JPanel implements BurnWatcher,
 	static {
 		Application.setBaseTranslator(new ResourceBundleTranslator(
 				"l10n.messages"));
-		Application.setMotorSetDatabase(new OneMotorDatabase());
+		//Application.setMotorSetDatabase(new OneMotorDatabase());
 		Application.setPreferences(new SwingPreferences());
 
 	}
@@ -195,8 +198,8 @@ public class RocketSimTable extends JPanel implements BurnWatcher,
 		preferredUnitsChanged();
 	}
 
-	public void openRocket(File f) throws RocketLoadException {
-		this.doc = new OpenRocketLoader().load(f);
+	public void openRocket(File f) throws RocketLoadException, IOException {
+		this.doc = new OpenRocketLoader().loadFromStream(new FileInputStream(f), new DatabaseMotorFinder());
 		// JPanel rocketInfo = new JPanel();
 		// JLabel name = new JLabel("File: " + f.getAbsolutePath());
 		// rocketInfo.add(name);
diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorsEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorsEditor.java
index 63d8156..b9d7469 100644
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorsEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorsEditor.java
@@ -23,8 +23,6 @@ import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 import javax.swing.JTabbedPane;
 
-import net.sf.openrocket.file.RocketLoadException;
-
 import org.apache.log4j.Logger;
 
 import com.billkuker.rocketry.motorsim.Burn;
@@ -163,7 +161,7 @@ public class MotorsEditor extends MultiObjectEditor<Motor, MotorEditor> {
 			log.warn("Opening File " + file.getAbsolutePath());
 			try {
 				rst.openRocket(file);
-			} catch (RocketLoadException e) {
+			} catch (Exception e) {
 				log.error(e);
 			}
 		}
diff --git a/peter.xml b/peter.xml
new file mode 100644
index 0000000..fb4e52a
--- /dev/null
+++ b/peter.xml
@@ -0,0 +1,42 @@
+<object-stream>
+	<com.billkuker.rocketry.motorsim.Motor>
+		<chamber class="com.billkuker.rocketry.motorsim.CylindricalChamber">
+			<ID>100 mm</ID>
+			<OD>120 mm</OD>
+			<length>920 mm</length>
+		</chamber>
+		<fuel class="com.billkuker.rocketry.motorsim.fuel.KNDX"
+			serialization="custom">
+			<java.net.URI>
+				<default>
+					<string>motorsim:KNDX</string>
+				</default>
+			</java.net.URI>
+		</fuel>
+		<grain class="com.billkuker.rocketry.motorsim.grain.MultiGrain">
+			<count>4</count>
+			<grain class="com.billkuker.rocketry.motorsim.grain.MultiPort">
+				<aftEndInhibited>false</aftEndInhibited>
+				<coreD>15 mm</coreD>
+				<foreEndInhibited>false</foreEndInhibited>
+				<inhibitOutside>true</inhibitOutside>
+				<length>215 mm</length>
+				<oD>100 mm</oD>
+				<r1Count>5</r1Count>
+				<r1D>15 mm</r1D>
+				<r1Offset>20 mm</r1Offset>
+				<r2Count>9</r2Count>
+				<r2D>15 mm</r2D>
+				<r2Offset>40 mm</r2Offset>
+				<ringTwoRot>20 °</ringTwoRot>
+			</grain>
+			<spacing>6 mm</spacing>
+		</grain>
+		<name>New Motor 1</name>
+		<nozzle class="com.billkuker.rocketry.motorsim.ConvergentDivergentNozzle">
+			<efficiency>0.85</efficiency>
+			<exitDiameter>90 mm</exitDiameter>
+			<throatDiameter>33 mm</throatDiameter>
+		</nozzle>
+	</com.billkuker.rocketry.motorsim.Motor>
+</object-stream>
\ No newline at end of file
-- 
2.30.2