Merge commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD

[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 796bc0e..6e352d4 100644 (file)
--- a/src/jalview/fts/service/pdb/PDBFTSRestClient.java
+++ b/src/jalview/fts/service/pdb/PDBFTSRestClient.java
@@ -41,6 +41,8 @@ import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
 import jalview.datamodel.SequenceI;
 import jalview.fts.api.FTSData;
 import jalview.fts.api.FTSDataColumnI;
@@ -62,13 +64,18 @@ import jalview.util.Platform;
  * @author tcnofoegbu
  */
 public class PDBFTSRestClient extends FTSRestClient
-        implements StructureFTSRestClientI
+        implements StructureFTSRestClientI,ApplicationSingletonI
 {
 
   private static FTSRestClientI instance = null;
 
   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);
+  }
   protected PDBFTSRestClient()
   {
   }
@@ -178,6 +185,7 @@ public class PDBFTSRestClient extends FTSRestClient
       System.out.println(uri);
       ClientResponse clientResponse = null;
       int responseStatus = -1;
+
       // Get the JSON string from the response object or directly from the
       // client (JavaScript)
       Map<String, Object> jsonObj = null;
@@ -210,7 +218,6 @@ public class PDBFTSRestClient extends FTSRestClient
       switch (responseStatus)
       {
       case 200:
-
         if (isMocked())
         {
           responseString = mockQueries.get(uri.toString());
@@ -368,7 +375,6 @@ public class PDBFTSRestClient extends FTSRestClient
       result = new ArrayList<FTSData>();
       if (numFound > 0)
       {
-
         for (Iterator<Object> docIter = docs.iterator(); docIter.hasNext();)
         {
           Map<String, Object> doc = (Map<String, Object>) docIter.next();
@@ -380,7 +386,6 @@ public class PDBFTSRestClient extends FTSRestClient
       searchResult.setNumberOfItemsFound(numFound);
       searchResult.setResponseTime(queryTime);
       searchResult.setSearchSummary(result);
-
     } catch (ParseException e)
     {
       e.printStackTrace();
@@ -509,14 +514,6 @@ public class PDBFTSRestClient extends FTSRestClient
     return "/fts/pdb_data_columns.txt";
   }
 
-  public static FTSRestClientI getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new PDBFTSRestClient();
-    }
-    return instance;
-  }
 
   private Collection<FTSDataColumnI> allDefaultDisplayedStructureDataColumns;
 
@@ -532,7 +529,6 @@ public class PDBFTSRestClient extends FTSRestClient
     }
     return allDefaultDisplayedStructureDataColumns;
   }
-
   @Override
   public String[] getPreferencesColumnsFor(PreferenceSource source)
   {