Changed map parser to ignore " in lines like "x y z" (at ComPhy 2012 Moscow)

[jalview.git] / forester / java / src / org / forester / tools / PhylogenyDecorator.java

diff --git a/forester/java/src/org/forester/tools/PhylogenyDecorator.java b/forester/java/src/org/forester/tools/PhylogenyDecorator.java
index e67ae8e..90959dc 100644 (file)
--- a/forester/java/src/org/forester/tools/PhylogenyDecorator.java
+++ b/forester/java/src/org/forester/tools/PhylogenyDecorator.java
@@ -154,8 +154,8 @@ public final class PhylogenyDecorator {
                         if ( new_values.containsKey( TP_NODE_NAME ) ) {
                             node.setName( new_values.get( TP_NODE_NAME ) );
                         }
-                    }
-                }
+                    } // if ( new_values != null ) 
+                } // if ( map.containsKey( name ) || ( numbers_of_chars_allowed_to_remove_if_not_found_in_map > 0 ) )
                 else if ( picky ) {
                     throw new IllegalArgumentException( "\"" + name + "\" not found in name map" );
                 }