Bump out the timeouts on the Preset loader so it doesn't complain when running with...

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

diff --git a/core/src/net/sf/openrocket/startup/ConcurrentComponentPresetDatabaseLoader.java b/core/src/net/sf/openrocket/startup/ConcurrentComponentPresetDatabaseLoader.java
index a97d688cd0f69b57f1e18d59c46188b5a47a7717..cc16ddc73bc4b81e9ba121838eb111b66ae90a17 100644 (file)
--- a/core/src/net/sf/openrocket/startup/ConcurrentComponentPresetDatabaseLoader.java
+++ b/core/src/net/sf/openrocket/startup/ConcurrentComponentPresetDatabaseLoader.java
@@ -14,6 +14,7 @@ import net.sf.openrocket.file.iterator.FileIterator;
 import net.sf.openrocket.gui.util.SimpleFileFilter;
 import net.sf.openrocket.logging.LogHelper;
 import net.sf.openrocket.preset.ComponentPreset;
+import net.sf.openrocket.preset.xml.OpenRocketComponentLoader;
 import net.sf.openrocket.util.Pair;
 
 public class ConcurrentComponentPresetDatabaseLoader {
@@ -69,9 +70,9 @@ public class ConcurrentComponentPresetDatabaseLoader {
        public void await() throws InterruptedException {
                latch.await();
                loaderPool.shutdown();
-               loaderPool.awaitTermination(10, TimeUnit.SECONDS);
+               loaderPool.awaitTermination(30, TimeUnit.SECONDS);
                writerPool.shutdown();
-               writerPool.awaitTermination(10, TimeUnit.SECONDS);
+               writerPool.awaitTermination(30, TimeUnit.SECONDS);
                iterator.close();
                long end = System.currentTimeMillis();
                log.debug("Time to load presets: " + (end-startTime) + "ms " + presetCount + " loaded from " + fileCount + " files");
@@ -115,7 +116,7 @@ public class ConcurrentComponentPresetDatabaseLoader {
 
                @Override
                public void run() {
-                       ComponentPresetDatabase.ComponentPresetLoader loader = new ComponentPresetDatabase.ComponentPresetLoader();
+                       OpenRocketComponentLoader loader = new OpenRocketComponentLoader();
                        Collection<ComponentPreset> presets = loader.load(is, fileName);
                        PresetWriter writer = new PresetWriter(presets);
                        writerPool.execute(writer);