Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / src / net / sf / openrocket / startup / Startup2.java

diff --git a/core/src/net/sf/openrocket/startup/Startup2.java b/core/src/net/sf/openrocket/startup/Startup2.java
index 85500a361299d3f49668afd4c9c983791406d9a5..6b7b49cdfc962aa351b6321b77f44831a8006788 100644 (file)
--- a/core/src/net/sf/openrocket/startup/Startup2.java
+++ b/core/src/net/sf/openrocket/startup/Startup2.java
@@ -84,11 +84,23 @@ public class Startup2 {
                Splash.init();
                
                // Must be done after localization is initialized
-               ComponentPresetDatabase componentPresetDao = new ComponentPresetDatabase();
-               ConcurrentComponentPresetDatabaseLoader presetLoader = new ConcurrentComponentPresetDatabaseLoader( componentPresetDao );
-               presetLoader.load();
-               
+               ComponentPresetDatabase componentPresetDao = new ComponentPresetDatabase(true) {
+
+                       @Override
+                       protected void load() {
+                               ConcurrentComponentPresetDatabaseLoader presetLoader = new ConcurrentComponentPresetDatabaseLoader( this );
+                               presetLoader.load();
+                               try {
+                                       presetLoader.await();
+                               } catch ( InterruptedException iex) {
+                                       
+                               }
+                       }
+                       
+               };
                Application.setComponentPresetDao( componentPresetDao );
+
+               componentPresetDao.startLoading();
                
                // Setup the uncaught exception handler
                log.info("Registering exception handler");
@@ -124,11 +136,6 @@ public class Startup2 {
                
                Databases.fakeMethod();
                
-               try {
-                       presetLoader.await();
-               } catch ( InterruptedException iex) {
-                       
-               }
 
                // Starting action (load files or open new document)
                log.info("Opening main application window");