X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblRestClient.java;h=3cc778a5cb99a356a2e6bffedcf8a0f0e4eb431b;hb=e83ce5d8ef826fc0b509a51f154abdf734501077;hp=4a5544e299670a6b1d38ef23ed34c9289f3ff284;hpb=ca74027f55fb1f8af9fef0d77348449a07a1b5d5;p=jalview.git

diff --git a/src/jalview/ext/ensembl/EnsemblRestClient.java b/src/jalview/ext/ensembl/EnsemblRestClient.java
index 4a5544e..3cc778a 100644
--- a/src/jalview/ext/ensembl/EnsemblRestClient.java
+++ b/src/jalview/ext/ensembl/EnsemblRestClient.java
@@ -36,6 +36,7 @@ import javax.ws.rs.HttpMethod;
 
 import org.json.simple.parser.ParseException;
 
+import jalview.util.HttpUtils;
 import jalview.util.Platform;
 import jalview.util.StringUtils;
 
@@ -211,7 +212,7 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
       return pingString != null;
     } catch (Throwable t)
     {
-      System.err.println(
+      jalview.bin.Console.errPrintln(
               "Error connecting to " + pingUrl + ": " + t.getMessage());
     } finally
     {
@@ -313,7 +314,9 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
        * note: a GET request for an invalid id returns an error code e.g. 415
        * but POST request returns 200 and an empty Fasta response 
        */
-      System.err.println("Response code " + responseCode);// + " for " + url);
+      jalview.bin.Console.errPrintln("Response code " + responseCode);// + " for
+                                                                      // " +
+                                                                      // url);
       return null;
     }
 
@@ -338,9 +341,10 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
   protected HttpURLConnection tryConnection(URL url, List<String> ids,
           int readTimeout) throws IOException, ProtocolException
   {
-    // System.out.println(System.currentTimeMillis() + " " + url);
+    // jalview.bin.Console.outPrintln(System.currentTimeMillis() + " " + url);
 
-    HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+    HttpURLConnection connection = (HttpURLConnection) HttpUtils
+            .openConnection(url);
 
     /*
      * POST method allows multiple queries in one request; it is supported for
@@ -387,14 +391,15 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
         int retrySecs = Integer.valueOf(retryDelay);
         if (retrySecs > 0 && retrySecs < 10)
         {
-          System.err.println(
+          jalview.bin.Console.errPrintln(
                   "Ensembl REST service rate limit exceeded, waiting "
                           + retryDelay + " seconds before retrying");
           Thread.sleep(1000 * retrySecs);
         }
       } catch (NumberFormatException | InterruptedException e)
       {
-        System.err.println("Error handling Retry-After: " + e.getMessage());
+        jalview.bin.Console.errPrintln(
+                "Error handling Retry-After: " + e.getMessage());
       }
     }
   }
@@ -566,7 +571,8 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
         }
       } catch (NumberFormatException e)
       {
-        System.err.println("Error in REST version: " + e.toString());
+        jalview.bin.Console
+                .errPrintln("Error in REST version: " + e.toString());
       }
 
       /*
@@ -578,14 +584,14 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
               expected) == 1;
       if (laterVersion)
       {
-        System.err.println(String.format(
+        jalview.bin.Console.errPrintln(String.format(
                 "EnsemblRestClient expected %s REST version %s but found %s, see %s",
                 getDbSource(), expected, version, REST_CHANGE_LOG));
       }
       info.restVersion = version;
     } catch (Throwable t)
     {
-      System.err.println(
+      jalview.bin.Console.errPrintln(
               "Error checking Ensembl REST version: " + t.getMessage());
     }
   }
@@ -617,7 +623,7 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
       domainData.get(getDomain()).dataVersion = versions.get(0).toString();
     } catch (Throwable e)
     {// could be IOException | ParseException e) {
-      System.err.println(
+      jalview.bin.Console.errPrintln(
               "Error checking Ensembl data version: " + e.getMessage());
     }
   }