JAL-3253 preliminary static fixes for JavaScript part 3 of 3

[jalview.git] / src / jalview / ws / SequenceFetcherFactory.java

diff --git a/src/jalview/ws/SequenceFetcherFactory.java b/src/jalview/ws/SequenceFetcherFactory.java
index 9cc4960..64dac0d 100644 (file)
--- a/src/jalview/ws/SequenceFetcherFactory.java
+++ b/src/jalview/ws/SequenceFetcherFactory.java
@@ -20,13 +20,12 @@
  */
 package jalview.ws;
 
+import jalview.bin.Jalview;
 import jalview.ws.seqfetcher.ASequenceFetcher;
 
 public class SequenceFetcherFactory
 {
 
-  private static SequenceFetcher instance;
-
   /**
    * Returns a new SequenceFetcher object, or a mock object if one has been set
    * 
@@ -34,7 +33,10 @@ public class SequenceFetcherFactory
    */
   public static ASequenceFetcher getSequenceFetcher()
   {
-    return instance == null ? new SequenceFetcher() : instance;
+    Jalview j = Jalview.getInstance();
+    return (j.sequenceFetcher == null
+            ? j.sequenceFetcher = new SequenceFetcher()
+            : j.sequenceFetcher);
   }
 
   /**
@@ -47,6 +49,6 @@ public class SequenceFetcherFactory
    */
   public static void setSequenceFetcher(SequenceFetcher sf)
   {
-    instance = sf;
+    Jalview.getInstance().sequenceFetcher = sf;
   }
 }