hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put the loadMotor() method back since it is useful to python bindings.

Browse Source
This commit is contained in:
Kevin Ruland 2012-05-15 04:28:14 +00:00
parent 538fa66415
commit 1ee93fdab0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/net/sf/openrocket/startup/Startup2.java
View File

@ -113,10 +113,8 @@ public class Startup2 {
// Load motors etc.
log.info("Loading databases");
ConcurrentLoadingThrustCurveMotorSetDatabase motorLoader = new ConcurrentLoadingThrustCurveMotorSetDatabase(THRUSTCURVE_DIRECTORY);
motorLoader.startLoading();
Application.setMotorSetDatabase(motorLoader);
loadMotor();
Databases.fakeMethod();
try {
@ -137,6 +135,14 @@ public class Startup2 {
}
/**
* this method is useful for the python bindings.
*/
public static void loadMotor() {
ConcurrentLoadingThrustCurveMotorSetDatabase motorLoader = new ConcurrentLoadingThrustCurveMotorSetDatabase(THRUSTCURVE_DIRECTORY);
motorLoader.startLoading();
Application.setMotorSetDatabase(motorLoader);
}
/**
* Check that the JRE is not running headless.