Correct component dao startup on Decal test programs
This commit is contained in:
parent
a0fad818de
commit
348db9d685
@ -6,16 +6,12 @@ import net.sf.openrocket.database.ThrustCurveMotorSetDatabase;
|
|||||||
import net.sf.openrocket.document.OpenRocketDocument;
|
import net.sf.openrocket.document.OpenRocketDocument;
|
||||||
import net.sf.openrocket.file.DatabaseMotorFinder;
|
import net.sf.openrocket.file.DatabaseMotorFinder;
|
||||||
import net.sf.openrocket.file.openrocket.importt.OpenRocketLoader;
|
import net.sf.openrocket.file.openrocket.importt.OpenRocketLoader;
|
||||||
import net.sf.openrocket.gui.configdialog.NoseConeConfig;
|
|
||||||
import net.sf.openrocket.gui.configdialog.RocketComponentConfig;
|
import net.sf.openrocket.gui.configdialog.RocketComponentConfig;
|
||||||
import net.sf.openrocket.gui.util.GUIUtil;
|
import net.sf.openrocket.gui.util.GUIUtil;
|
||||||
import net.sf.openrocket.gui.util.SwingPreferences;
|
import net.sf.openrocket.gui.util.SwingPreferences;
|
||||||
import net.sf.openrocket.l10n.ResourceBundleTranslator;
|
import net.sf.openrocket.l10n.ResourceBundleTranslator;
|
||||||
import net.sf.openrocket.rocketcomponent.NoseCone;
|
import net.sf.openrocket.rocketcomponent.NoseCone;
|
||||||
import net.sf.openrocket.rocketcomponent.RocketComponent;
|
import net.sf.openrocket.rocketcomponent.RocketComponent;
|
||||||
import net.sf.openrocket.startup.Application;
|
|
||||||
import net.sf.openrocket.startup.ConcurrentComponentPresetDatabaseLoader;
|
|
||||||
import net.sf.openrocket.startup.ExceptionHandler;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An application for quickly testing 3d figure witout all the OpenRocket user
|
* An application for quickly testing 3d figure witout all the OpenRocket user
|
||||||
|
@ -57,6 +57,7 @@ public class Quick3dMain {
|
|||||||
|
|
||||||
};
|
};
|
||||||
componentPresetDao.load("datafiles", ".*csv");
|
componentPresetDao.load("datafiles", ".*csv");
|
||||||
|
componentPresetDao.startLoading();
|
||||||
Application.setComponentPresetDao( componentPresetDao );
|
Application.setComponentPresetDao( componentPresetDao );
|
||||||
|
|
||||||
OpenRocketDocument doc = new OpenRocketLoader().loadFromStream(
|
OpenRocketDocument doc = new OpenRocketLoader().loadFromStream(
|
||||||
|
@ -10,13 +10,11 @@ import net.sf.openrocket.database.ComponentPresetDatabase;
|
|||||||
import net.sf.openrocket.database.ThrustCurveMotorSetDatabase;
|
import net.sf.openrocket.database.ThrustCurveMotorSetDatabase;
|
||||||
import net.sf.openrocket.document.OpenRocketDocument;
|
import net.sf.openrocket.document.OpenRocketDocument;
|
||||||
import net.sf.openrocket.file.DatabaseMotorFinder;
|
import net.sf.openrocket.file.DatabaseMotorFinder;
|
||||||
import net.sf.openrocket.file.openrocket.importt.OpenRocketLoader;
|
|
||||||
import net.sf.openrocket.file.rocksim.importt.RocksimLoader;
|
import net.sf.openrocket.file.rocksim.importt.RocksimLoader;
|
||||||
import net.sf.openrocket.gui.main.componenttree.ComponentTree;
|
import net.sf.openrocket.gui.main.componenttree.ComponentTree;
|
||||||
import net.sf.openrocket.gui.scalefigure.RocketPanel;
|
import net.sf.openrocket.gui.scalefigure.RocketPanel;
|
||||||
import net.sf.openrocket.gui.util.SwingPreferences;
|
import net.sf.openrocket.gui.util.SwingPreferences;
|
||||||
import net.sf.openrocket.l10n.ResourceBundleTranslator;
|
import net.sf.openrocket.l10n.ResourceBundleTranslator;
|
||||||
import net.sf.openrocket.startup.Application;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An application for quickly testing 3d figure witout all the OpenRocket user
|
* An application for quickly testing 3d figure witout all the OpenRocket user
|
||||||
@ -59,6 +57,7 @@ public class TextureTest {
|
|||||||
|
|
||||||
};
|
};
|
||||||
componentPresetDao.load("datafiles", ".*csv");
|
componentPresetDao.load("datafiles", ".*csv");
|
||||||
|
componentPresetDao.startLoading();
|
||||||
Application.setComponentPresetDao(componentPresetDao);
|
Application.setComponentPresetDao(componentPresetDao);
|
||||||
|
|
||||||
OpenRocketDocument doc = new RocksimLoader().load(
|
OpenRocketDocument doc = new RocksimLoader().load(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user