JAL-3210 Barebones gradle/buildship/eclipse. See README

[jalview.git] / src / jalview / fts / service / uniprot / UniProtFTSRestClient.java

diff --git a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
index 871ba19..3f0b8a4 100644 (file)
--- a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
+++ b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
@@ -22,7 +22,6 @@
 package jalview.fts.service.uniprot;
 
 import jalview.bin.Cache;
-import jalview.bin.Instance;
 import jalview.fts.api.FTSData;
 import jalview.fts.api.FTSDataColumnI;
 import jalview.fts.api.FTSRestClientI;
@@ -46,30 +45,24 @@ import com.sun.jersey.api.client.config.DefaultClientConfig;
 
 public class UniProtFTSRestClient extends FTSRestClient
 {
+  private static final String DEFAULT_UNIPROT_DOMAIN = "https://www.uniprot.org";
 
-  public static FTSRestClientI getInstance()
-  {
-    Instance j = Instance.getInstance();
-    return (j.uniprotFTSRestClient == null ? j.uniprotFTSRestClient = new UniProtFTSRestClient()
-            : j.uniprotFTSRestClient);
-  }
-
-  private UniProtFTSRestClient()
+  static
   {
-    // singleton -- use getInstance()
-
-    uniprotSearchEndpoint = Cache.getDefault("UNIPROT_DOMAIN",
-            DEFAULT_UNIPROT_DOMAIN) + "/uniprot/";    
+    Platform.addJ2SDirectDatabaseCall(DEFAULT_UNIPROT_DOMAIN);
   }
 
-  private static final String DEFAULT_UNIPROT_DOMAIN = "https://www.uniprot.org";
+  private static FTSRestClientI instance = null;
 
   public final String uniprotSearchEndpoint;
 
-  static
+  public UniProtFTSRestClient()
   {
-    Platform.addJ2SDirectDatabaseCall(DEFAULT_UNIPROT_DOMAIN);
+    super();
+    uniprotSearchEndpoint = Cache.getDefault("UNIPROT_DOMAIN",
+            DEFAULT_UNIPROT_DOMAIN) + "/uniprot/";    
   }
+
   @SuppressWarnings("unchecked")
   @Override
   public FTSRestResponse executeRequest(FTSRestRequest uniprotRestRequest)
@@ -354,6 +347,15 @@ public class UniProtFTSRestClient extends FTSRestClient
     };
   }
 
+  public static FTSRestClientI getInstance()
+  {
+    if (instance == null)
+    {
+      instance = new UniProtFTSRestClient();
+    }
+    return instance;
+  }
+
   @Override
   public String getColumnDataConfigFileName()
   {