From 5f670c8818720f6732dfb68e314bfe94f5a97bb2 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Tue, 15 May 2012 04:28:14 +0000 Subject: [PATCH] Put the loadMotor() method back since it is useful to python bindings. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@675 180e2498-e6e9-4542-8430-84ac67f01cd8 --- core/src/net/sf/openrocket/startup/Startup2.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/core/src/net/sf/openrocket/startup/Startup2.java b/core/src/net/sf/openrocket/startup/Startup2.java index b2e13195..3ab137a9 100644 --- a/core/src/net/sf/openrocket/startup/Startup2.java +++ b/core/src/net/sf/openrocket/startup/Startup2.java @@ -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. -- 2.47.2