JAL-2885 ENSEMBL-DOMAIN -> ENSEMBL-BASEURL

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

diff --git a/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java b/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java
index 2f642b5..f16dda6 100644 (file)
--- 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 = "http://rest.ensembl.org";
+
+  protected static final String DEFAULT_ENSEMBL_GENOMES_BASEURL = "http://rest.ensemblgenomes.org";
 
   /*
    * accepts ENSG/T/E/P with 11 digits
@@ -76,9 +78,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;
   }