Merge branch 'bug/JAL-2846' into develop

[jalview.git] / src / jalview / ext / ensembl / EnsemblInfo.java

diff --git a/src/jalview/ext/ensembl/EnsemblInfo.java b/src/jalview/ext/ensembl/EnsemblInfo.java
index de55a53..fa24f1e 100644 (file)
--- a/src/jalview/ext/ensembl/EnsemblInfo.java
+++ b/src/jalview/ext/ensembl/EnsemblInfo.java
@@ -61,18 +61,6 @@ public class EnsemblInfo extends EnsemblRestClient
     return true;
   }
 
-  @Override
-  protected String getRequestMimeType(boolean multipleIds)
-  {
-    return "application/json";
-  }
-
-  @Override
-  protected String getResponseMimeType()
-  {
-    return "application/json";
-  }
-
   /**
    * Answers the domain (http://rest.ensembl.org or
    * http://rest.ensemblgenomes.org) for the given division, or null if not
@@ -101,17 +89,17 @@ public class EnsemblInfo extends EnsemblRestClient
     /*
      * for convenience, pre-fill ensembl.org as the domain for "ENSEMBL"
      */
-    divisions.put(DBRefSource.ENSEMBL.toUpperCase(), ENSEMBL_REST);
+    divisions.put(DBRefSource.ENSEMBL.toUpperCase(), ensemblDomain);
 
     BufferedReader br = null;
     try
     {
-      URL url = getDivisionsUrl(ENSEMBL_GENOMES_REST);
+      URL url = getDivisionsUrl(ensemblGenomesDomain);
       if (url != null)
       {
         br = getHttpResponse(url, null);
       }
-      parseResponse(br, ENSEMBL_GENOMES_REST);
+      parseResponse(br, ensemblGenomesDomain);
     } catch (IOException e)
     {
       // ignore