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 1fa9cc9..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.Jalview;
+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,21 +31,24 @@ import java.util.HashSet;
 
 import compbio.data.msa.JABAService;
 
-public class Jws2InstanceFactory
+public class Jws2InstanceFactory implements ApplicationSingletonI
 {
 
-  private HashMap<String, AlignAnalysisUIText> aaConGUI;
-
-  private HashSet<String> ignoreGUI;
+  private Jws2InstanceFactory()
+  {
+    // private singleton
+  }
 
-  public static Jws2InstanceFactory getInstance()
+  private static Jws2InstanceFactory getInstance()
   {
-    Jalview j = Jalview.getInstance();
-    return (j.jws2InstanceFactory == null
-            ? j.jws2InstanceFactory = new Jws2InstanceFactory()
-            : j.jws2InstanceFactory);
+    return (Jws2InstanceFactory) ApplicationSingletonProvider
+            .getInstance(Jws2InstanceFactory.class);
   }
 
+  private HashMap<String, AlignAnalysisUIText> aaConGUI;
+
+  private HashSet<String> ignoreGUI;
+
   private static String category_rewrite(String cat_name)
   {
     return (cat_name != null && cat_name.equals("Prediction"))