JAL-3253 jalview.bin.Instance streamlining

[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 1fe92f5..a91985c 100644 (file)
--- a/src/jalview/ext/ensembl/EnsemblInfo.java
+++ b/src/jalview/ext/ensembl/EnsemblInfo.java
@@ -30,25 +30,9 @@ public class EnsemblInfo extends EnsemblRestClient
             : j.ensemblInfo);
   }
 
-  /*
-   * cached results of REST /info/divisions service, currently
-   * <pre>
-   * { 
-   *  { "ENSEMBLFUNGI", "http://rest.ensemblgenomes.org"},
-   *    "ENSEMBLBACTERIA", "http://rest.ensemblgenomes.org"},
-   *    "ENSEMBLPROTISTS", "http://rest.ensemblgenomes.org"},
-   *    "ENSEMBLMETAZOA", "http://rest.ensemblgenomes.org"},
-   *    "ENSEMBLPLANTS",  "http://rest.ensemblgenomes.org"},
-   *    "ENSEMBL", "http://rest.ensembl.org" }
-   *  }
-   * </pre>
-   * The values for EnsemblGenomes are retrieved by a REST call, that for
-   * Ensembl is added programmatically for convenience of lookup
-   */
-  private Map<String, String> divisions = new HashMap<>();
-
   private EnsemblInfo()
   {
+    // use getInstance()
 
     /*
      * for convenience, pre-fill ensembl.org as the domain for "ENSEMBL"
@@ -75,6 +59,23 @@ public class EnsemblInfo extends EnsemblRestClient
     }
   }
 
+  /*
+   * cached results of REST /info/divisions service, currently
+   * <pre>
+   * { 
+   *  { "ENSEMBLFUNGI", "http://rest.ensemblgenomes.org"},
+   *    "ENSEMBLBACTERIA", "http://rest.ensemblgenomes.org"},
+   *    "ENSEMBLPROTISTS", "http://rest.ensemblgenomes.org"},
+   *    "ENSEMBLMETAZOA", "http://rest.ensemblgenomes.org"},
+   *    "ENSEMBLPLANTS",  "http://rest.ensemblgenomes.org"},
+   *    "ENSEMBL", "http://rest.ensembl.org" }
+   *  }
+   * </pre>
+   * The values for EnsemblGenomes are retrieved by a REST call, that for
+   * Ensembl is added programmatically for convenience of lookup
+   */
+  private Map<String, String> divisions = new HashMap<>();
+
   @Override
   public String getDbName()
   {