JAL-1953 2.11.2 with Archeopteryx!

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 1a42f58..92cc153 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -1429,7 +1429,7 @@ public class Desktop extends jalview.jbgui.GDesktop
       {
         new SplashScreen(false);
       }
-    }, "ShowAboutMenuThread").start();
+    }, "ShowAboutMenu").start();
   }
 
   /**
@@ -1797,7 +1797,7 @@ public class Desktop extends jalview.jbgui.GDesktop
           }
           setProgressBar(null, chosenFile.hashCode());
         }
-      }, "SaveJalviewProjectThread").start();
+      }, "SaveJalviewProject").start();
     }
   }
 
@@ -1842,13 +1842,17 @@ public class Desktop extends jalview.jbgui.GDesktop
       {
         File selectedFile = chooser.getSelectedFile();
         setProjectFile(selectedFile);
-        String choice = selectedFile.getAbsolutePath();
+        final String choice = selectedFile.getAbsolutePath();
         Cache.setProperty("LAST_DIRECTORY", selectedFile.getParent());
         new Thread(new Runnable()
         {
           @Override
           public void run()
           {
+          setProgressBar(MessageManager.formatMessage(
+                "label.loading_jalview_project", new Object[]
+                 { choice }), choice.hashCode());
+
             try
             {
               new Jalview2XML().loadJalviewAlign(selectedFile);
@@ -1868,6 +1872,7 @@ public class Desktop extends jalview.jbgui.GDesktop
                               .getString("label.couldnt_load_project"),
                       JvOptionPane.WARNING_MESSAGE);
             }
+          setProgressBar(null, choice.hashCode());
           }
         }, "Project Loader").start();
       }
@@ -2187,7 +2192,7 @@ public class Desktop extends jalview.jbgui.GDesktop
   {
     UserQuestionnaireCheck jvq = new UserQuestionnaireCheck(url);
     // javax.swing.SwingUtilities.invokeLater(jvq);
-    new Thread(jvq, "CheckQuestionnaireThread").start();
+    new Thread(jvq, "CheckQuestionnaire").start();
   }
 
   public void checkURLLinks()
@@ -2299,7 +2304,7 @@ public class Desktop extends jalview.jbgui.GDesktop
       this.showMemoryUsage = showMemory;
       if (showMemory)
       {
-        Thread worker = new Thread(this, "ShowMemoryUsageThread");
+        Thread worker = new Thread(this, "ShowMemoryUsage");
         worker.start();
       }
       repaint();
@@ -2753,7 +2758,7 @@ public class Desktop extends jalview.jbgui.GDesktop
       }
       // JAL-940 - disabled JWS1 service configuration - always start discoverer
       // until we phase out completely
-      (t0 = new Thread(discoverer, "DiscovererThread")).start();
+      (t0 = new Thread(discoverer, "Discoverer")).start();
     }
 
     if (ignore_SHOW_JWS2_SERVICES_preference
@@ -2905,7 +2910,7 @@ public class Desktop extends jalview.jbgui.GDesktop
           progress.setProgressBar(null, this.hashCode());
         }
       }
-    }, "OpenURLThread").start();
+    }, "OpenURL").start();
   }
 
   public static WsParamSetManager wsparamManager = null;