From: cmzmasek@gmail.com <cmzmasek@gmail.com@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Date: Fri, 8 Jun 2012 16:05:43 +0000 (+0000)
Subject: phylotastic hackathon at NESCENT 120608
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0d0beacca7b6cf72428f1037abf5e0dcedf4b5aa;p=jalview.git

phylotastic hackathon at NESCENT 120608
---

diff --git a/forester/java/src/org/forester/application/gsdi.java b/forester/java/src/org/forester/application/gsdi.java
index e97b504..3f39fb8 100644
--- a/forester/java/src/org/forester/application/gsdi.java
+++ b/forester/java/src/org/forester/application/gsdi.java
@@ -33,6 +33,7 @@ import java.util.List;
 
 
 import org.forester.io.parsers.PhylogenyParser;
+import org.forester.io.parsers.nhx.NHXParser;
 import org.forester.io.parsers.phyloxml.PhyloXmlParser;
 import org.forester.io.parsers.util.ParserUtils;
 import org.forester.io.writers.PhylogenyWriter;
@@ -48,6 +49,7 @@ import org.forester.util.ForesterUtil;
 
 public final class gsdi {
 
+    final static public boolean REPLACE_UNDERSCORES_IN_NH_SPECIES_TREE = true;
     final static private String STRIP_OPTION                 = "s";
     final static private String SDI_OPTION                   = "b";
     final static private String MOST_PARSIMONIOUS_OPTION     = "m";
@@ -151,6 +153,9 @@ public final class gsdi {
             }
             else {
                 final PhylogenyParser p = ParserUtils.createParserDependingOnFileType( species_tree_file, true );
+                if ( REPLACE_UNDERSCORES_IN_NH_SPECIES_TREE && p instanceof NHXParser ) {
+                    (( NHXParser ) p ).setReplaceUnderscores( true );
+                }
                 species_tree = factory.create( species_tree_file, p )[ 0 ];
                 PhylogenyMethods.transferNodeNameToField( species_tree,
                                                           PhylogenyMethods.PhylogenyNodeField.TAXONOMY_SCIENTIFIC_NAME );
diff --git a/forester/java/src/org/forester/util/ForesterConstants.java b/forester/java/src/org/forester/util/ForesterConstants.java
index fc29b1f..ccb270a 100644
--- a/forester/java/src/org/forester/util/ForesterConstants.java
+++ b/forester/java/src/org/forester/util/ForesterConstants.java
@@ -27,8 +27,8 @@ package org.forester.util;
 
 public final class ForesterConstants {
 
-    public final static String  FORESTER_VERSION            = "1.001";
-    public final static String  FORESTER_DATE               = "120607";
+    public final static String  FORESTER_VERSION            = "1.003";
+    public final static String  FORESTER_DATE               = "120608";
     
     public final static String  PHYLO_XML_VERSION           = "1.10";
     public final static String  PHYLO_XML_LOCATION          = "http://www.phyloxml.org";