X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FSpecies.java;h=afa8d54e787045cacb8796bf2c05bd9c1db24914;hb=404d5b51a7a7781ad6924df6a7ce63c754370f16;hp=d8a00a5a1e726571eb3f053a951ec01ef9f8dbd3;hpb=550c391f0c113658e540783dc89034a34280ef18;p=jalview.git

diff --git a/src/jalview/ext/ensembl/Species.java b/src/jalview/ext/ensembl/Species.java
index d8a00a5..afa8d54 100644
--- a/src/jalview/ext/ensembl/Species.java
+++ b/src/jalview/ext/ensembl/Species.java
@@ -1,5 +1,28 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.ext.ensembl;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Selected species identifiers used by Ensembl
  * 
@@ -13,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;
 
@@ -29,4 +65,9 @@ enum Species
   {
     return modelOrganism;
   }
+
+  public static Set<Species> getModelOrganisms()
+  {
+    return modelOrganisms;
+  }
 }