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

[jalview.git] / src / jalview / fts / service / pdb / PDBFTSRestClient.java

diff --git a/src/jalview/fts/service/pdb/PDBFTSRestClient.java b/src/jalview/fts/service/pdb/PDBFTSRestClient.java
index 87d640b..cd3e5c9 100644 (file)
--- a/src/jalview/fts/service/pdb/PDBFTSRestClient.java
+++ b/src/jalview/fts/service/pdb/PDBFTSRestClient.java
@@ -20,8 +20,6 @@
  */
 package jalview.fts.service.pdb;
 
-import jalview.bin.ApplicationSingletonProvider;
-import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
 import jalview.datamodel.SequenceI;
 import jalview.fts.api.FTSData;
 import jalview.fts.api.FTSDataColumnI;
@@ -55,19 +53,15 @@ import com.sun.jersey.api.client.config.DefaultClientConfig;
  * 
  * @author tcnofoegbu
  */
-public class PDBFTSRestClient extends FTSRestClient implements ApplicationSingletonI
+public class PDBFTSRestClient extends FTSRestClient
 {
-  public static final String PDB_SEARCH_ENDPOINT = "https://www.ebi.ac.uk/pdbe/search/pdb/select?";
 
-  public static FTSRestClientI getInstance()
-  {
-    return (FTSRestClientI) ApplicationSingletonProvider
-            .getInstance(PDBFTSRestClient.class);
-  }
+  private static FTSRestClientI instance = null;
+
+  public static final String PDB_SEARCH_ENDPOINT = "https://www.ebi.ac.uk/pdbe/search/pdb/select?";
 
-  private PDBFTSRestClient()
+  protected PDBFTSRestClient()
   {
-    // singleton -- use getInstance()
   }
 
   /**
@@ -465,6 +459,15 @@ public static String parseJsonExceptionString(String jsonErrorResponse)
     return "/fts/pdb_data_columns.txt";
   }
 
+  public static FTSRestClientI getInstance()
+  {
+    if (instance == null)
+    {
+      instance = new PDBFTSRestClient();
+    }
+    return instance;
+  }
+
   private Collection<FTSDataColumnI> allDefaultDisplayedStructureDataColumns;
 
   public Collection<FTSDataColumnI> getAllDefaultDisplayedStructureDataColumns()