Merge branch 'Jalview-JS/develop' into merge_js_develop

[jalview.git] / src / jalview / ws / jws1 / Discoverer.java

diff --git a/src/jalview/ws/jws1/Discoverer.java b/src/jalview/ws/jws1/Discoverer.java
index 6aa3f48..9a6c445 100644 (file)
--- a/src/jalview/ws/jws1/Discoverer.java
+++ b/src/jalview/ws/jws1/Discoverer.java
@@ -20,15 +20,8 @@
  */
 package jalview.ws.jws1;
 
-import jalview.bin.ApplicationSingletonProvider;
-import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
-import jalview.gui.AlignmentPanel;
-import jalview.gui.JvOptionPane;
-import jalview.util.MessageManager;
-
 import java.net.URL;
 import java.util.Hashtable;
-import java.util.List;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
@@ -37,6 +30,11 @@ import ext.vamsas.IRegistryServiceLocator;
 import ext.vamsas.RegistryServiceSoapBindingStub;
 import ext.vamsas.ServiceHandle;
 import ext.vamsas.ServiceHandles;
+import jalview.bin.Cache;
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
+import jalview.gui.JvOptionPane;
+import jalview.util.MessageManager;
 
 public class Discoverer implements Runnable, ApplicationSingletonI
 {
@@ -404,17 +402,9 @@ public class Discoverer implements Runnable, ApplicationSingletonI
   @Override
   public void run()
   {
-    final Discoverer discoverer = this;
-    Thread discoverThread = new Thread()
-    {
-      @Override
-      public void run()
-      {
-        Discoverer.doDiscovery();
-        discoverer.discoverServices();
-      }
-    };
-    discoverThread.start();
+    Cache.log.info("Discovering jws1 services");
+    Discoverer.doDiscovery();
+    discoverServices();
   }
 
   /**