From 0388050710cd71972578efcc4c90ec773830502a Mon Sep 17 00:00:00 2001
From: Bill Kuker <bkuker@billkuker.com>
Date: Sat, 30 Oct 2010 16:52:57 +0000
Subject: [PATCH] Organization

---
 .classpath                                    |  16 ++++-----
 MotorIOTest.xml                               |  26 ++++++--------
 .../gui/jcommon-1.0.15.jar                    | Bin
 .../gui/jfreechart-1.0.12.jar                 | Bin
 .../gui/l2fprod-common-sheet.jar              | Bin
 .../gui/rsyntaxtextarea.jar                   | Bin
 jscience.jar => lib/jscience.jar              | Bin
 log4j-1.2.15.jar => lib/log4j-1.2.15.jar      | Bin
 .../xpp3_min-1.1.4c.jar                       | Bin
 xstream-1.3.jar => lib/xstream-1.3.jar        | Bin
 test/MotorIOTest.xml                          |  32 ++++++++++++++++++
 test/UnitTests.java                           |   4 +++
 XStreamMotor.xml => test/XStreamMotor.xml     |   0
 13 files changed, 55 insertions(+), 23 deletions(-)
 rename jcommon-1.0.15.jar => lib/gui/jcommon-1.0.15.jar (100%)
 rename jfreechart-1.0.12.jar => lib/gui/jfreechart-1.0.12.jar (100%)
 rename l2fprod-common-sheet.jar => lib/gui/l2fprod-common-sheet.jar (100%)
 rename rsyntaxtextarea.jar => lib/gui/rsyntaxtextarea.jar (100%)
 rename jscience.jar => lib/jscience.jar (100%)
 rename log4j-1.2.15.jar => lib/log4j-1.2.15.jar (100%)
 rename xpp3_min-1.1.4c.jar => lib/xpp3_min-1.1.4c.jar (100%)
 rename xstream-1.3.jar => lib/xstream-1.3.jar (100%)
 create mode 100644 test/MotorIOTest.xml
 create mode 100644 test/UnitTests.java
 rename XStreamMotor.xml => test/XStreamMotor.xml (100%)

diff --git a/.classpath b/.classpath
index ae85208..eb443c4 100644
--- a/.classpath
+++ b/.classpath
@@ -5,15 +5,15 @@
 	<classpathentry kind="src" path="motors"/>
 	<classpathentry kind="src" path="gui"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="jscience.jar"/>
-	<classpathentry kind="lib" path="jfreechart-1.0.12.jar"/>
-	<classpathentry kind="lib" path="jcommon-1.0.15.jar"/>
-	<classpathentry kind="lib" path="log4j-1.2.15.jar"/>
-	<classpathentry kind="lib" path="l2fprod-common-sheet.jar"/>
-	<classpathentry kind="lib" path="xstream-1.3.jar"/>
-	<classpathentry kind="lib" path="xpp3_min-1.1.4c.jar"/>
-	<classpathentry kind="lib" path="rsyntaxtextarea.jar"/>
 	<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/jcommon-1.0.15.jar"/>
+	<classpathentry kind="lib" path="lib/gui/jfreechart-1.0.12.jar"/>
+	<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"/>
+	<classpathentry kind="lib" path="lib/xstream-1.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/MotorIOTest.xml b/MotorIOTest.xml
index ab98321..deca6d5 100644
--- a/MotorIOTest.xml
+++ b/MotorIOTest.xml
@@ -1,32 +1,28 @@
 <object-stream>
   <com.billkuker.rocketry.motorsim.Motor>
     <chamber class="com.billkuker.rocketry.motorsim.CylindricalChamber">
+      <ID>30 mm</ID>
+      <OD>31 mm</OD>
       <length>200 mm</length>
-      <iD>30 mm</iD>
     </chamber>
+    <fuel class="com.billkuker.rocketry.motorsim.fuel.KNSU"/>
     <grain class="com.billkuker.rocketry.motorsim.grain.MultiGrain">
+      <count>2</count>
       <grain class="com.billkuker.rocketry.motorsim.grain.CoredCylindricalGrain">
-        <foreEndInhibited>false</foreEndInhibited>
+        <ID>8 mm</ID>
+        <OD>29 mm</OD>
         <aftEndInhibited>false</aftEndInhibited>
+        <foreEndInhibited>false</foreEndInhibited>
+        <innerSurfaceInhibited>false</innerSurfaceInhibited>
         <length>70 mm</length>
-        <endLight>0 mm</endLight>
-        <oD>29 mm</oD>
-        <iD>8 mm</iD>
         <outerSurfaceInhibited>true</outerSurfaceInhibited>
-        <innerSurfaceInhibited>false</innerSurfaceInhibited>
       </grain>
-      <count>2</count>
-      <flush>1.0</flush>
-      <delay>0 mm</delay>
     </grain>
+    <name>IOTestMotor</name>
     <nozzle class="com.billkuker.rocketry.motorsim.ConvergentDivergentNozzle">
-      <throatDiameter>7.9 mm</throatDiameter>
-      <exitDiameter>9 mm</exitDiameter>
       <efficiency>0.87</efficiency>
+      <exitDiameter>9 mm</exitDiameter>
+      <throatDiameter>7.9 mm</throatDiameter>
     </nozzle>
-    <fuel class="com.billkuker.rocketry.motorsim.fuel.KNSU">
-      <t>English</t>
-    </fuel>
-    <name>IOTestMotor</name>
   </com.billkuker.rocketry.motorsim.Motor>
 </object-stream>
\ No newline at end of file
diff --git a/jcommon-1.0.15.jar b/lib/gui/jcommon-1.0.15.jar
similarity index 100%
rename from jcommon-1.0.15.jar
rename to lib/gui/jcommon-1.0.15.jar
diff --git a/jfreechart-1.0.12.jar b/lib/gui/jfreechart-1.0.12.jar
similarity index 100%
rename from jfreechart-1.0.12.jar
rename to lib/gui/jfreechart-1.0.12.jar
diff --git a/l2fprod-common-sheet.jar b/lib/gui/l2fprod-common-sheet.jar
similarity index 100%
rename from l2fprod-common-sheet.jar
rename to lib/gui/l2fprod-common-sheet.jar
diff --git a/rsyntaxtextarea.jar b/lib/gui/rsyntaxtextarea.jar
similarity index 100%
rename from rsyntaxtextarea.jar
rename to lib/gui/rsyntaxtextarea.jar
diff --git a/jscience.jar b/lib/jscience.jar
similarity index 100%
rename from jscience.jar
rename to lib/jscience.jar
diff --git a/log4j-1.2.15.jar b/lib/log4j-1.2.15.jar
similarity index 100%
rename from log4j-1.2.15.jar
rename to lib/log4j-1.2.15.jar
diff --git a/xpp3_min-1.1.4c.jar b/lib/xpp3_min-1.1.4c.jar
similarity index 100%
rename from xpp3_min-1.1.4c.jar
rename to lib/xpp3_min-1.1.4c.jar
diff --git a/xstream-1.3.jar b/lib/xstream-1.3.jar
similarity index 100%
rename from xstream-1.3.jar
rename to lib/xstream-1.3.jar
diff --git a/test/MotorIOTest.xml b/test/MotorIOTest.xml
new file mode 100644
index 0000000..ab98321
--- /dev/null
+++ b/test/MotorIOTest.xml
@@ -0,0 +1,32 @@
+<object-stream>
+  <com.billkuker.rocketry.motorsim.Motor>
+    <chamber class="com.billkuker.rocketry.motorsim.CylindricalChamber">
+      <length>200 mm</length>
+      <iD>30 mm</iD>
+    </chamber>
+    <grain class="com.billkuker.rocketry.motorsim.grain.MultiGrain">
+      <grain class="com.billkuker.rocketry.motorsim.grain.CoredCylindricalGrain">
+        <foreEndInhibited>false</foreEndInhibited>
+        <aftEndInhibited>false</aftEndInhibited>
+        <length>70 mm</length>
+        <endLight>0 mm</endLight>
+        <oD>29 mm</oD>
+        <iD>8 mm</iD>
+        <outerSurfaceInhibited>true</outerSurfaceInhibited>
+        <innerSurfaceInhibited>false</innerSurfaceInhibited>
+      </grain>
+      <count>2</count>
+      <flush>1.0</flush>
+      <delay>0 mm</delay>
+    </grain>
+    <nozzle class="com.billkuker.rocketry.motorsim.ConvergentDivergentNozzle">
+      <throatDiameter>7.9 mm</throatDiameter>
+      <exitDiameter>9 mm</exitDiameter>
+      <efficiency>0.87</efficiency>
+    </nozzle>
+    <fuel class="com.billkuker.rocketry.motorsim.fuel.KNSU">
+      <t>English</t>
+    </fuel>
+    <name>IOTestMotor</name>
+  </com.billkuker.rocketry.motorsim.Motor>
+</object-stream>
\ No newline at end of file
diff --git a/test/UnitTests.java b/test/UnitTests.java
new file mode 100644
index 0000000..05f3801
--- /dev/null
+++ b/test/UnitTests.java
@@ -0,0 +1,4 @@
+
+public class UnitTests {
+
+}
diff --git a/XStreamMotor.xml b/test/XStreamMotor.xml
similarity index 100%
rename from XStreamMotor.xml
rename to test/XStreamMotor.xml
-- 
2.30.2