Merge pull request #78 from kruland2607/master

Load presets in foreground thread.
This commit is contained in:
kruland2607 2013-04-26 19:31:27 -07:00
commit 1d33f1db8c

View File

@ -20,8 +20,8 @@ import net.sf.openrocket.gui.main.BasicFrame;
import net.sf.openrocket.gui.main.MRUDesignFile;
import net.sf.openrocket.gui.main.Splash;
import net.sf.openrocket.gui.main.SwingExceptionHandler;
import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.gui.util.BlockingMotorDatabaseProvider;
import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.util.BuildProperties;
@ -165,14 +165,13 @@ public class ApplicationStartup {
}
/**
* Start loading preset components in background thread.
*
* Public for Python bindings.
*/
public void loadPresetComponents() {
ComponentPresetDatabase componentPresetDao = new ComponentPresetDatabase(true) {
ComponentPresetDatabase componentPresetDao = new ComponentPresetDatabase(false) {
@Override
protected void load() {
ConcurrentComponentPresetDatabaseLoader presetLoader = new ConcurrentComponentPresetDatabaseLoader(this);