[jsword-svn] r1214 - trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2006-12-18 11:48:05 -0700 (Mon, 18 Dec 2006)
New Revision: 1214

Modified:
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
Log:
removing Farsi debug code.

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java	2006-12-18 18:18:03 UTC (rev 1213)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java	2006-12-18 18:48:05 UTC (rev 1214)
@@ -119,7 +119,6 @@
     {
         try
         {
-            Locale.setDefault(new Locale("fa"));
             ThreadGroup group = new CatchingThreadGroup("BibleDesktopUIGroup"); //$NON-NLS-1$
             Thread t = new DesktopThread(group);
             t.start();
@@ -144,15 +143,10 @@
         // ResourceBundles, properties and other resources
         Project project = Project.instance();
 
-        // Splash screen
-        URL predicturl = project.getWritablePropertiesURL(SPLASH_PROPS);
-        Job startJob = JobManager.createJob(Msg.STARTUP_TITLE.toString(), predicturl, true);
-
         // Load the configuration.
         // This has to be done before any gui components are created.
-        // (Other than the splash)
+        // (Including the splash)
         // This includes code that is invoked by it.
-        startJob.setProgress(Msg.STARTUP_CONFIG.toString());
         generateConfig();
 
         // Make this be the root frame of optiondialogs
@@ -161,6 +155,12 @@
         // Grab errors
         Reporter.grabAWTExecptions(true);
 
+        // Splash screen
+        URL predicturl = project.getWritablePropertiesURL(SPLASH_PROPS);
+        Job startJob = JobManager.createJob(Msg.STARTUP_TITLE.toString(), predicturl, true);
+
+        //startJob.setProgress(Msg.STARTUP_CONFIG.toString());
+
         // Create the Desktop Actions
         actions = new DesktopActions(this);
 
@@ -773,6 +773,7 @@
     public final void generateConfig()
     {
         fillChoiceFactory();
+
         config = new Config(Msg.CONFIG_TITLE.toString());
         Document xmlconfig = null;
         try