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

[jalview.git] / src / jalview / ws / jws2 / Jws2Discoverer.java

diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java
index 6eaaee1..bd4d352 100644 (file)
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@ -21,7 +21,8 @@
 package jalview.ws.jws2;
 
 import jalview.bin.Cache;
-import jalview.bin.Instance;
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
 import jalview.gui.AlignFrame;
 import jalview.gui.Desktop;
 import jalview.gui.JvSwingUtils;
@@ -61,7 +62,8 @@ import compbio.ws.client.Services;
  * @author JimP
  * 
  */
-public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
+public class Jws2Discoverer
+        implements Runnable, WSMenuEntryProviderI, ApplicationSingletonI
 {
 
   /**
@@ -71,10 +73,8 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
    */
   public static Jws2Discoverer getInstance()
   {
-    Instance j = Instance.getInstance();
-    return (j.j2s2discoverer == null
-            ? j.j2s2discoverer = new Jws2Discoverer()
-            : j.j2s2discoverer);
+    return (Jws2Discoverer) ApplicationSingletonProvider
+            .getInstance(Jws2Discoverer.class);
   }
 
   /**