isJS cleanup

[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 b4100cb..1f4d56a 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.Jalview;
 import jalview.fts.api.FTSData;
 import jalview.fts.api.FTSDataColumnI;
 import jalview.fts.api.FTSRestClientI;
@@ -30,6 +29,7 @@ import jalview.fts.core.FTSRestClient;
 import jalview.fts.core.FTSRestRequest;
 import jalview.fts.core.FTSRestResponse;
 import jalview.util.MessageManager;
+import jalview.util.Platform;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -47,6 +47,10 @@ public class UniProtFTSRestClient extends FTSRestClient
 {
   private static final String DEFAULT_UNIPROT_DOMAIN = "https://www.uniprot.org";
 
+  static {
+         Cache.addJ2SDirectDatabaseCall(DEFAULT_UNIPROT_DOMAIN);
+  }
+  
   private static FTSRestClientI instance = null;
 
   public final String uniprotSearchEndpoint;
@@ -55,7 +59,7 @@ public class UniProtFTSRestClient extends FTSRestClient
   {
     super();
     uniprotSearchEndpoint = Cache.getDefault("UNIPROT_DOMAIN",
-            DEFAULT_UNIPROT_DOMAIN) + "/uniprot/";
+            DEFAULT_UNIPROT_DOMAIN) + "/uniprot/";    
   }
 
   @Override
@@ -92,13 +96,18 @@ public class UniProtFTSRestClient extends FTSRestClient
       // Java
       Client client;
       Class<ClientResponse> clientResponseClass;
-      if (Jalview.isJS())
+      if (Platform.isJS())
       {
         // JavaScript only -- coerce types to Java types for Java
         client = (Client) (Object) new jalview.javascript.web.Client();
         clientResponseClass = (Class<ClientResponse>) (Object) jalview.javascript.web.ClientResponse.class;
       }
       else
+      /**
+       * Java only
+       * 
+       * @j2sNative
+       */
       {
         // Java only
         client = Client.create(new DefaultClientConfig());
@@ -128,7 +137,7 @@ public class UniProtFTSRestClient extends FTSRestClient
         throw new Exception(errorMessage);
 
       }
-      int xTotalResults = Jalview.isJS() ? 1
+      int xTotalResults = Platform.isJS() ? 1
               : Integer.valueOf(clientResponse.getHeaders()
                       .get("X-Total-Results").get(0));
       clientResponse = null;