From cd9a9583f95f454af2b32ce0c877626480d365e0 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Thu, 29 Mar 2012 02:53:37 +0000 Subject: [PATCH] Correct startup order. Since parsing the body tube preset library uses BodyTube and therefore Material and ExternalComponent which holds on to static copies of the translator, it must be done after localization is initialized. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@492 180e2498-e6e9-4542-8430-84ac67f01cd8 --- core/src/net/sf/openrocket/startup/Startup.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/startup/Startup.java b/core/src/net/sf/openrocket/startup/Startup.java index 95b03c52..3f5f176f 100644 --- a/core/src/net/sf/openrocket/startup/Startup.java +++ b/core/src/net/sf/openrocket/startup/Startup.java @@ -53,10 +53,11 @@ public class Startup { Application.setPreferences( new SwingPreferences() ); - Application.setDaos( new DaosImpl() ); - // Setup the translations initializeL10n(); + + // Must be done after localization is initialized + Application.setDaos( new DaosImpl() ); // Continue startup in Startup2 class (where Application is already set up) Startup2.runMain(args); -- 2.47.2