Organization

diff --git a/.classpath b/.classpath
index ae85208b16bac8c4bd377bf1213fce348f955a1a..eb443c4d7cd8b9e4a9f07f8dbad5409916030a53 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -5,15 +5,15 @@
        <classpathentry kind="src" path="motors"/>\r
        <classpathentry kind="src" path="gui"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-       <classpathentry kind="lib" path="jscience.jar"/>\r
-       <classpathentry kind="lib" path="jfreechart-1.0.12.jar"/>\r
-       <classpathentry kind="lib" path="jcommon-1.0.15.jar"/>\r
-       <classpathentry kind="lib" path="log4j-1.2.15.jar"/>\r
-       <classpathentry kind="lib" path="l2fprod-common-sheet.jar"/>\r
-       <classpathentry kind="lib" path="xstream-1.3.jar"/>\r
-       <classpathentry kind="lib" path="xpp3_min-1.1.4c.jar"/>\r
-       <classpathentry kind="lib" path="rsyntaxtextarea.jar"/>\r
        <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/jcommon-1.0.15.jar"/>\r
+       <classpathentry kind="lib" path="lib/gui/jfreechart-1.0.12.jar"/>\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
+       <classpathentry kind="lib" path="lib/xstream-1.3.jar"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/MotorIOTest.xml b/MotorIOTest.xml
index ab983211e0c3d5f14c09b984778c4b0c0ad8d6d1..deca6d57029a430408eda93a153d3d7e04262780 100644 (file)
--- 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/XStreamMotor.xml b/XStreamMotor.xml
deleted file mode 100644 (file)
index 786105e..0000000
--- a/XStreamMotor.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<object-stream>
-  <com.billkuker.rocketry.motorsim.motors.kuker.PVC9>
-    <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>PVC9</name>
-  </com.billkuker.rocketry.motorsim.motors.kuker.PVC9>
-</object-stream>
\ No newline at end of file

diff --git a/jcommon-1.0.15.jar b/jcommon-1.0.15.jar
deleted file mode 100644 (file)
index d0dc26d..0000000
Binary files a/jcommon-1.0.15.jar and /dev/null differ

diff --git a/jfreechart-1.0.12.jar b/jfreechart-1.0.12.jar
deleted file mode 100644 (file)
index 73be90f..0000000
Binary files a/jfreechart-1.0.12.jar and /dev/null differ

diff --git a/jscience.jar b/jscience.jar
deleted file mode 100644 (file)
index 52be1f1..0000000
Binary files a/jscience.jar and /dev/null differ

diff --git a/l2fprod-common-sheet.jar b/l2fprod-common-sheet.jar
deleted file mode 100644 (file)
index c6a0e46..0000000
Binary files a/l2fprod-common-sheet.jar and /dev/null differ

diff --git a/lib/gui/jcommon-1.0.15.jar b/lib/gui/jcommon-1.0.15.jar
new file mode 100644 (file)
index 0000000..d0dc26d
Binary files /dev/null and b/lib/gui/jcommon-1.0.15.jar differ

diff --git a/lib/gui/jfreechart-1.0.12.jar b/lib/gui/jfreechart-1.0.12.jar
new file mode 100644 (file)
index 0000000..73be90f
Binary files /dev/null and b/lib/gui/jfreechart-1.0.12.jar differ

diff --git a/lib/gui/l2fprod-common-sheet.jar b/lib/gui/l2fprod-common-sheet.jar
new file mode 100644 (file)
index 0000000..c6a0e46
Binary files /dev/null and b/lib/gui/l2fprod-common-sheet.jar differ

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

diff --git a/lib/jscience.jar b/lib/jscience.jar
new file mode 100644 (file)
index 0000000..52be1f1
Binary files /dev/null and b/lib/jscience.jar differ

diff --git a/lib/log4j-1.2.15.jar b/lib/log4j-1.2.15.jar
new file mode 100644 (file)
index 0000000..c930a6a
Binary files /dev/null and b/lib/log4j-1.2.15.jar differ

diff --git a/lib/xpp3_min-1.1.4c.jar b/lib/xpp3_min-1.1.4c.jar
new file mode 100644 (file)
index 0000000..813a9a8
Binary files /dev/null and b/lib/xpp3_min-1.1.4c.jar differ

diff --git a/lib/xstream-1.3.jar b/lib/xstream-1.3.jar
new file mode 100644 (file)
index 0000000..e5a3234
Binary files /dev/null and b/lib/xstream-1.3.jar differ

diff --git a/log4j-1.2.15.jar b/log4j-1.2.15.jar
deleted file mode 100644 (file)
index c930a6a..0000000
Binary files a/log4j-1.2.15.jar and /dev/null differ

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

diff --git a/test/MotorIOTest.xml b/test/MotorIOTest.xml
new file mode 100644 (file)
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 (file)
index 0000000..05f3801
--- /dev/null
+++ b/test/UnitTests.java
@@ -0,0 +1,4 @@
+\r
+public class UnitTests {\r
+\r
+}\r

diff --git a/test/XStreamMotor.xml b/test/XStreamMotor.xml
new file mode 100644 (file)
index 0000000..786105e
--- /dev/null
+++ b/test/XStreamMotor.xml
@@ -0,0 +1,32 @@
+<object-stream>
+  <com.billkuker.rocketry.motorsim.motors.kuker.PVC9>
+    <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>PVC9</name>
+  </com.billkuker.rocketry.motorsim.motors.kuker.PVC9>
+</object-stream>
\ No newline at end of file

diff --git a/xpp3_min-1.1.4c.jar b/xpp3_min-1.1.4c.jar
deleted file mode 100644 (file)
index 813a9a8..0000000
Binary files a/xpp3_min-1.1.4c.jar and /dev/null differ

diff --git a/xstream-1.3.jar b/xstream-1.3.jar
deleted file mode 100644 (file)
index e5a3234..0000000
Binary files a/xstream-1.3.jar and /dev/null differ