X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsdi%2FSDI.java;h=59cc489f1bf70270d1897b2292e8f349d3cefc9f;hb=0ee466206ea1e3ac3025df1110538e3815c160b4;hp=c783ce095332f7f9a899367dc059d45142518c1f;hpb=4cefcbf8c547e86e56ed503f0a3d1a06e462e60e;p=jalview.git diff --git a/forester/java/src/org/forester/sdi/SDI.java b/forester/java/src/org/forester/sdi/SDI.java index c783ce0..59cc489 100644 --- a/forester/java/src/org/forester/sdi/SDI.java +++ b/forester/java/src/org/forester/sdi/SDI.java @@ -214,8 +214,9 @@ public abstract class SDI { * links (sets the field "link" of PhylogenyNode) each external * PhylogenyNode of gene_tree to the external PhylogenyNode of species_tree * which has the same species name. + * @throws SDIException */ - void linkNodesOfG() { + void linkNodesOfG() throws SDIException { final Map speciestree_ext_nodes = new HashMap(); final TaxonomyComparisonBase tax_comp_base = determineTaxonomyComparisonBase(); // Put references to all external nodes of the species tree into a map. @@ -301,6 +302,26 @@ public abstract class SDI { } public enum TaxonomyComparisonBase { - ID, CODE, SCIENTIFIC_NAME + ID { + + @Override + public String toString() { + return "taxonomy id"; + } + }, + CODE { + + @Override + public String toString() { + return "taxonomy code/mnemonic"; + } + }, + SCIENTIFIC_NAME { + + @Override + public String toString() { + return "scientific name"; + } + } } }