JAL-281 added file identify criteria for PhyloXML and Nexus

diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index ff959b0..a4d6e8b 100755 (executable)
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -334,15 +334,26 @@ public class IdentifyFile
           reply = FileFormat.Phylip;
           break;
         }
-        else
+        else if (!lineswereskipped && looksLikeJnetData(data))
         {
-          if (!lineswereskipped && looksLikeJnetData(data))
-          {
             reply = FileFormat.Jnet;
             break;
+
+        }
+        else // phylogenetic file?
+        {
+          if (source.nextLine().startsWith("<phyloxml"))
+          {
+            reply = FileFormat.PhyloXML;
+            break;
           }
+          else if (( ( data.startsWith( "nexus" ) ) || ( data.startsWith( "#nexus" ) )
+                || ( data.startsWith( "# nexus" ) ) || ( data.startsWith( "begin" ) ) ) ) 
+          {
+          reply = FileFormat.Nexus;      
+           break;
+        }
         }
-
         lineswereskipped = true; // this means there was some junk before any
         // key file signature
       }