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

[jalview.git] / src / jalview / ws / jws2 / jabaws2 / Jws2InstanceFactory.java

diff --git a/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java b/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
index 159edda..1983ff5 100644 (file)
--- a/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
+++ b/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
@@ -20,7 +20,8 @@
  */
 package jalview.ws.jws2.jabaws2;
 
-import jalview.bin.Instance;
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
 import jalview.ws.jws2.AAConClient;
 import jalview.ws.jws2.RNAalifoldClient;
 import jalview.ws.uimodel.AlignAnalysisUIText;
@@ -30,7 +31,7 @@ import java.util.HashSet;
 
 import compbio.data.msa.JABAService;
 
-public class Jws2InstanceFactory
+public class Jws2InstanceFactory implements ApplicationSingletonI
 {
 
   private Jws2InstanceFactory()
@@ -40,10 +41,8 @@ public class Jws2InstanceFactory
 
   private static Jws2InstanceFactory getInstance()
   {
-    Instance j = Instance.getInstance();
-    return (j.jws2InstanceFactory == null
-            ? j.jws2InstanceFactory = new Jws2InstanceFactory()
-            : j.jws2InstanceFactory);
+    return (Jws2InstanceFactory) ApplicationSingletonProvider
+            .getInstance(Jws2InstanceFactory.class);
   }
 
   private HashMap<String, AlignAnalysisUIText> aaConGUI;