enhanced motor handling, bug fixes, initial optimization code

[debian/openrocket] / src / net / sf / openrocket / util / TestRockets.java

diff --git a/src/net/sf/openrocket/util/TestRockets.java b/src/net/sf/openrocket/util/TestRockets.java
index cf6b2787a959d401375cc2b56372194c80e6c62c..1748fcd8b3168d8e8aa0cdf8473a188d8da9a4b0 100644 (file)
--- a/src/net/sf/openrocket/util/TestRockets.java
+++ b/src/net/sf/openrocket/util/TestRockets.java
@@ -349,9 +349,9 @@ public class TestRockets {
                String id = rocket.newMotorConfigurationID();
                bodytube.setMotorMount(true);
                
-               Motor m = Application.getMotorSetDatabase().findMotors(null, null, "F12J", Double.NaN, Double.NaN).get(0);
-               bodytube.setMotor(id, m);
-               bodytube.setMotorOverhang(0.005);
+               //              Motor m = Application.getMotorSetDatabase().findMotors(null, null, "F12J", Double.NaN, Double.NaN).get(0);
+               //              bodytube.setMotor(id, m);
+               //              bodytube.setMotorOverhang(0.005);
                rocket.getDefaultConfiguration().setMotorConfigurationID(id);
                
                rocket.getDefaultConfiguration().setAllStages();
@@ -552,9 +552,9 @@ public class TestRockets {
                String id = rocket.newMotorConfigurationID();
                tube3.setMotorMount(true);
                
-               Motor m = Application.getMotorSetDatabase().findMotors(null, null, "L540", Double.NaN, Double.NaN).get(0);
-               tube3.setMotor(id, m);
-               tube3.setMotorOverhang(0.02);
+               //              Motor m = Application.getMotorSetDatabase().findMotors(null, null, "L540", Double.NaN, Double.NaN).get(0);
+               //              tube3.setMotor(id, m);
+               //              tube3.setMotorOverhang(0.02);
                rocket.getDefaultConfiguration().setMotorConfigurationID(id);
                
                //              tube3.setIgnitionEvent(MotorMount.IgnitionEvent.NEVER);