X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fio%2Fparsers%2Fnexus%2FNexusPhylogeniesParser.java;h=5760331f21272a679d1a02b2faa08c32553e5585;hb=ad896f6e18663a95f887e00ea9c24f73f3d387e6;hp=f104de3ebdb425a09a9eb7073837d51f1a45181e;hpb=7d44b232d0b61c02ef01d96d3db1d68744015bd7;p=jalview.git diff --git a/forester/java/src/org/forester/io/parsers/nexus/NexusPhylogeniesParser.java b/forester/java/src/org/forester/io/parsers/nexus/NexusPhylogeniesParser.java index f104de3..5760331 100644 --- a/forester/java/src/org/forester/io/parsers/nexus/NexusPhylogeniesParser.java +++ b/forester/java/src/org/forester/io/parsers/nexus/NexusPhylogeniesParser.java @@ -256,14 +256,17 @@ public class NexusPhylogeniesParser implements PhylogenyParser { } } if ( !isReplaceUnderscores() && ( ( getTaxonomyExtraction() != TAXONOMY_EXTRACTION.NO ) ) ) { - final String tax = ParserUtils.extractTaxonomyCodeFromNodeName( node.getName(), - getTaxonomyExtraction() ); - if ( !ForesterUtil.isEmpty( tax ) ) { - if ( !node.getNodeData().isHasTaxonomy() ) { - node.getNodeData().setTaxonomy( new Taxonomy() ); - } - node.getNodeData().getTaxonomy().setTaxonomyCode( tax ); - } + + ParserUtils.extractTaxonomyDataFromNodeName( node, getTaxonomyExtraction() ); + +// final String tax = ParserUtils.extractTaxonomyCodeFromNodeName( node.getName(), +// getTaxonomyExtraction() ); +// if ( !ForesterUtil.isEmpty( tax ) ) { +// if ( !node.getNodeData().isHasTaxonomy() ) { +// node.getNodeData().setTaxonomy( new Taxonomy() ); +// } +// node.getNodeData().getTaxonomy().setTaxonomyCode( tax ); +// } } } }