X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblSequenceFetcher.java;h=9e3fef4bac6537b186f512a57a5f987fe53a1cfa;hb=948bd3bcbacc509da0cefaae3eedd97300a6ccce;hp=2f642b5dda146b3fec670591d8e853152e2a07e8;hpb=f87f3bc59e76f6112821e01ed88cf4c3ed853379;p=jalview.git

diff --git a/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java b/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java
index 2f642b5..9e3fef4 100644
--- a/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java
+++ b/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java
@@ -34,12 +34,14 @@ import com.stevesoft.pat.Regex;
 abstract class EnsemblSequenceFetcher extends DbSourceProxyImpl
 {
   // domain properties lookup keys:
-  protected static final String ENSEMBL_DOMAIN = "ENSEMBL_DOMAIN";
-  protected static final String ENSEMBL_GENOMES_DOMAIN = "ENSEMBL_GENOMES_DOMAIN";
+  protected static final String ENSEMBL_BASEURL = "ENSEMBL_BASEURL";
+
+  protected static final String ENSEMBL_GENOMES_BASEURL = "ENSEMBL_GENOMES_BASEURL";
 
   // domain properties default values:
-  protected static final String DEFAULT_ENSEMBL_DOMAIN = "http://rest.ensembl.org";
-  protected static final String DEFAULT_ENSEMBL_GENOMES_DOMAIN = "http://rest.ensemblgenomes.org";
+  protected static final String DEFAULT_ENSEMBL_BASEURL = "https://rest.ensembl.org";
+
+  protected static final String DEFAULT_ENSEMBL_GENOMES_BASEURL = "https://rest.ensemblgenomes.org";
 
   /*
    * accepts ENSG/T/E/P with 11 digits
@@ -54,6 +56,18 @@ abstract class EnsemblSequenceFetcher extends DbSourceProxyImpl
 
   protected final String ensemblDomain;
 
+  protected static final String OBJECT_TYPE_TRANSLATION = "Translation";
+
+  protected static final String OBJECT_TYPE_TRANSCRIPT = "Transcript";
+
+  protected static final String OBJECT_TYPE_GENE = "Gene";
+
+  protected static final String PARENT = "Parent";
+
+  protected static final String JSON_ID = "id";
+
+  protected static final String OBJECT_TYPE = "object_type";
+
   /*
    * possible values for the 'feature' parameter of the /overlap REST service
    * @see http://rest.ensembl.org/documentation/info/overlap_id
@@ -76,9 +90,10 @@ abstract class EnsemblSequenceFetcher extends DbSourceProxyImpl
      * the default domain names may be overridden in .jalview_properties;
      * this allows an easy change from http to https in future if needed
      */
-    ensemblDomain = Cache.getDefault(ENSEMBL_DOMAIN, DEFAULT_ENSEMBL_DOMAIN);
-    ensemblGenomesDomain = Cache.getDefault(ENSEMBL_GENOMES_DOMAIN,
-            DEFAULT_ENSEMBL_GENOMES_DOMAIN);
+    ensemblDomain = Cache.getDefault(ENSEMBL_BASEURL,
+            DEFAULT_ENSEMBL_BASEURL);
+    ensemblGenomesDomain = Cache.getDefault(ENSEMBL_GENOMES_BASEURL,
+            DEFAULT_ENSEMBL_GENOMES_BASEURL);
     domain = ensemblDomain;
   }