JAL-4036 Don't autosearch changing index when autosearch is de-selected

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

diff --git a/src/jalview/ext/ensembl/Species.java b/src/jalview/ext/ensembl/Species.java
index af01225..afa8d54 100644 (file)
--- a/src/jalview/ext/ensembl/Species.java
+++ b/src/jalview/ext/ensembl/Species.java
@@ -20,6 +20,9 @@
  */
 package jalview.ext.ensembl;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Selected species identifiers used by Ensembl
  * 
@@ -33,10 +36,23 @@ enum Species
    * valid species parameters to Ensembl REST services where applicable
    */
   human(true), mouse(true), s_cerevisiae(true), cow(false), pig(false),
-  rat(true), celegans(true), sheep(false), horse(false), gorilla(false),
-  rabbit(false), gibbon(false), dog(false), orangutan(false), xenopus(true),
-  chimpanzee(false), cat(false), zebrafish(true), chicken(true),
-  dmelanogaster(true);
+  rattus_norvegicus(true), celegans(true), sheep(false), horse(false),
+  gorilla(false), rabbit(false), gibbon(false), dog(false),
+  orangutan(false), xenopus_tropicalis(true), chimpanzee(false), cat(false),
+  zebrafish(true), chicken(true), drosophila_melanogaster(true);
+
+  static Set<Species> modelOrganisms = new HashSet<>();
+
+  static
+  {
+    for (Species s : values())
+    {
+      if (s.isModelOrganism())
+      {
+        modelOrganisms.add(s);
+      }
+    }
+  }
 
   boolean modelOrganism;
 
@@ -49,4 +65,9 @@ enum Species
   {
     return modelOrganism;
   }
+
+  public static Set<Species> getModelOrganisms()
+  {
+    return modelOrganisms;
+  }
 }