Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

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

diff --git a/core/src/net/sf/openrocket/startup/Startup.java b/core/src/net/sf/openrocket/startup/Startup.java
index 14e82f360df3fdfc596e62b613ef741efbf62692..31f83184ad18c4026973e4f2d3919ce2fc0f0bfb 100644 (file)
--- a/core/src/net/sf/openrocket/startup/Startup.java
+++ b/core/src/net/sf/openrocket/startup/Startup.java
@@ -4,7 +4,6 @@ import java.io.PrintStream;
 import java.util.Locale;
 import java.util.prefs.Preferences;
 
-import net.sf.openrocket.database.ComponentPresetDatabase;
 import net.sf.openrocket.gui.util.SwingPreferences;
 import net.sf.openrocket.l10n.DebugTranslator;
 import net.sf.openrocket.l10n.L10N;
@@ -39,7 +38,6 @@ public class Startup {
        
        private static final int LOG_BUFFER_LENGTH = 50;
        
-       
        /**
         * OpenRocket startup main method.
         */
@@ -56,17 +54,11 @@ public class Startup {
                // Setup the translations
                initializeL10n();
 
-               // Must be done after localization is initialized
-               ComponentPresetDatabase componentPresetDao = new ComponentPresetDatabase();
-               componentPresetDao.load("datafiles/presets", "(?i).*orc");
-               Application.setComponentPresetDao( componentPresetDao );
-               
                // Continue startup in Startup2 class (where Application is already set up)
                Startup2.runMain(args);
                
        }
        
-       
 
        /**
         * Set proper system properties if openrocket.debug is defined.
@@ -92,7 +84,7 @@ public class Startup {
        /**
         * Initializes the loggins system.
         */
-       private static void initializeLogging() {
+       public static void initializeLogging() {
                DelegatorLogger delegator = new DelegatorLogger();
                
                // Log buffer