JAL-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...

[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 25fcc6b..74263b1 100644 (file)
--- a/src/jalview/ws/jws1/Discoverer.java
+++ b/src/jalview/ws/jws1/Discoverer.java
@@ -20,7 +20,8 @@
  */
 package jalview.ws.jws1;
 
-import jalview.bin.Jalview;
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
 import jalview.gui.JvOptionPane;
 import jalview.util.MessageManager;
 
@@ -35,14 +36,17 @@ import ext.vamsas.RegistryServiceSoapBindingStub;
 import ext.vamsas.ServiceHandle;
 import ext.vamsas.ServiceHandles;
 
-public class Discoverer implements Runnable
+public class Discoverer implements Runnable, ApplicationSingletonI
 {
 
   public static Discoverer getInstance()
   {
-    Jalview j = Jalview.getInstance();
-    return (j.discoverer == null ? j.discoverer = new Discoverer()
-            : j.discoverer);
+    return (Discoverer) ApplicationSingletonProvider.getInstance(Discoverer.class);
+  }
+
+  private Discoverer()
+  {
+    // use getInstance()
   }
 
   private java.net.URL RootServiceURL = null;