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

Merge pull request #78 from kruland2607/master

Browse Source 
Load presets in foreground thread.
This commit is contained in:
kruland2607 2013-04-26 19:31:27 -07:00
commit 1d33f1db8c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/net/sf/openrocket/startup/ApplicationStartup.java
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.MRUDesignFile;
import net.sf.openrocket.gui.main.Splash; import net.sf.openrocket.gui.main.Splash;
import net.sf.openrocket.gui.main.SwingExceptionHandler; 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.BlockingMotorDatabaseProvider;
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.logging.LogHelper; import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.util.BuildProperties; import net.sf.openrocket.util.BuildProperties;
@ -165,14 +165,13 @@ public class ApplicationStartup {
} }
/** /**
* Start loading preset components in background thread. * Start loading preset components in background thread.
* *
* Public for Python bindings. * Public for Python bindings.
*/ */
public void loadPresetComponents() { public void loadPresetComponents() {
ComponentPresetDatabase componentPresetDao = new ComponentPresetDatabase(true) { ComponentPresetDatabase componentPresetDao = new ComponentPresetDatabase(false) {
@Override @Override
protected void load() { protected void load() {
ConcurrentComponentPresetDatabaseLoader presetLoader = new ConcurrentComponentPresetDatabaseLoader(this); ConcurrentComponentPresetDatabaseLoader presetLoader = new ConcurrentComponentPresetDatabaseLoader(this);