JAL-3253 jalview.bin.Instance handles all singleton instances -

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

diff --git a/src/jalview/ws/SequenceFetcherFactory.java b/src/jalview/ws/SequenceFetcherFactory.java
index 2b8f364..63231d5 100644 (file)
--- a/src/jalview/ws/SequenceFetcherFactory.java
+++ b/src/jalview/ws/SequenceFetcherFactory.java
@@ -1,12 +1,31 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.ws;
 
+import jalview.bin.Instance;
 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
    * 
@@ -14,7 +33,10 @@ public class SequenceFetcherFactory
    */
   public static ASequenceFetcher getSequenceFetcher()
   {
-    return instance == null ? new SequenceFetcher() : instance;
+    Instance j = Instance.getInstance();
+    return (j.sequenceFetcher == null
+            ? j.sequenceFetcher = new SequenceFetcher()
+            : j.sequenceFetcher);
   }
 
   /**
@@ -27,6 +49,6 @@ public class SequenceFetcherFactory
    */
   public static void setSequenceFetcher(SequenceFetcher sf)
   {
-    instance = sf;
+    Instance.getInstance().sequenceFetcher = sf;
   }
 }