phylotastic hackathon at NESCENT 120608

diff --git a/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java b/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java
index 16189da..d4582f6 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java
+++ b/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java
@@ -2714,7 +2714,7 @@ class NHFilter extends FileFilter {
         final String file_name = f.getName().trim().toLowerCase();
         return file_name.endsWith( ".nh" ) || file_name.endsWith( ".newick" ) || file_name.endsWith( ".phy" )
                 || file_name.endsWith( ".tr" ) || file_name.endsWith( ".tree" ) || file_name.endsWith( ".dnd" )
-                || file_name.endsWith( ".ph" ) || file_name.endsWith( ".phb" ) || file_name.endsWith( ".nwk" )
+                || file_name.endsWith( ".ph" )  || file_name.endsWith( ".phb" ) || file_name.endsWith( ".nwk" )
                 || f.isDirectory();
     }
 

diff --git a/forester/java/src/org/forester/io/parsers/util/ParserUtils.java b/forester/java/src/org/forester/io/parsers/util/ParserUtils.java
index a1f842e..f7b61f7 100644 (file)
--- a/forester/java/src/org/forester/io/parsers/util/ParserUtils.java
+++ b/forester/java/src/org/forester/io/parsers/util/ParserUtils.java
@@ -124,7 +124,7 @@ public final class ParserUtils {
         else if ( filename_lc.endsWith( ".nexus" ) || filename_lc.endsWith( ".nex" ) || filename_lc.endsWith( ".nx" ) ) {
             parser = new NexusPhylogeniesParser();
         }
-        else if ( filename_lc.endsWith( ".nhx" ) || filename_lc.endsWith( ".nh" ) || filename_lc.endsWith( ".newick" ) ) {
+        else if ( filename_lc.endsWith( ".nhx" ) || filename_lc.endsWith( ".nh" ) || filename_lc.endsWith( ".newick" ) || filename_lc.endsWith( ".nwk" ) ) {
             parser = new NHXParser();
         }
         return parser;