X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FIdentifyFile.java;h=ff959b0d79b281f5bb078e500bc768e270931c93;hb=f4766a7bbcfae845fc95923b01fa14ff83d589ff;hp=f8d8415bf749474734b9a195015cfd728b9a8c38;hpb=4815037f13748676b04b91dc761b73cf6f2d6ecd;p=jalview.git

diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index f8d8415..ff959b0 100755
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -72,10 +72,11 @@ public class IdentifyFile
     // preserves original behaviour prior to version 2.3
   }
 
-  public FileFormatI identify(AlignmentFileI file, boolean closeSource)
-          throws IOException
+  public FileFormatI identify(AlignmentFileReaderI file,
+          boolean closeSource) throws IOException
   {
-    FileParse fp = new FileParse(file.getInFile(), file.getDataSourceType());
+    FileParse fp = new FileParse(file.getInFile(),
+            file.getDataSourceType());
     return identify(fp, closeSource);
   }
 
@@ -98,12 +99,15 @@ public class IdentifyFile
     boolean lineswereskipped = false;
     boolean isBinary = false; // true if length is non-zero and non-printable
     // characters are encountered
+
     try
     {
       if (!closeSource)
       {
         source.mark();
       }
+      boolean aaIndexHeaderRead = false;
+
       while ((data = source.nextLine()) != null)
       {
         bytesRead += data.length();
@@ -141,6 +145,20 @@ public class IdentifyFile
         }
         data = data.toUpperCase();
 
+        if (data.startsWith(ScoreMatrixFile.SCOREMATRIX))
+        {
+          reply = FileFormat.ScoreMatrix;
+          break;
+        }
+        if (data.startsWith("H ") && !aaIndexHeaderRead)
+        {
+          aaIndexHeaderRead = true;
+        }
+        if (data.startsWith("D ") && aaIndexHeaderRead)
+        {
+          reply = FileFormat.ScoreMatrix;
+          break;
+        }
         if (data.startsWith("##GFF-VERSION"))
         {
           // GFF - possibly embedded in a Jalview features file!
@@ -257,9 +275,14 @@ public class IdentifyFile
           // read as a FASTA (probably)
           break;
         }
+        if (data.indexOf("{\"") > -1)
+        {
+          reply = FileFormat.Json;
+          break;
+        }
         int lessThan = data.indexOf("<");
         if ((lessThan > -1)) // possible Markup Language data i.e HTML,
-                                      // RNAML, XML
+                             // RNAML, XML
         {
           String upper = data.toUpperCase();
           if (upper.substring(lessThan).startsWith("<HTML"))
@@ -274,11 +297,6 @@ public class IdentifyFile
           }
         }
 
-        if (data.indexOf("{\"") > -1)
-        {
-          reply = FileFormat.Json;
-          break;
-        }
         if ((data.length() < 1) || (data.indexOf("#") == 0))
         {
           lineswereskipped = true;
@@ -292,9 +310,8 @@ public class IdentifyFile
           break;
         }
 
-        if ((data.indexOf("//") == 0)
-                || ((data.indexOf("!!") > -1) && (data.indexOf("!!") < data
-                        .indexOf("_MULTIPLE_ALIGNMENT "))))
+        if ((data.indexOf("//") == 0) || ((data.indexOf("!!") > -1) && (data
+                .indexOf("!!") < data.indexOf("_MULTIPLE_ALIGNMENT "))))
         {
           reply = FileFormat.MSF;
 
@@ -344,8 +361,8 @@ public class IdentifyFile
     }
     if (trimmedLength == 0)
     {
-      System.err
-              .println("File Identification failed! - Empty file was read.");
+      System.err.println(
+              "File Identification failed! - Empty file was read.");
       throw new FileFormatException("EMPTY DATA FILE");
     }
     System.out.println("File format identified as " + reply.toString());
@@ -370,8 +387,9 @@ public class IdentifyFile
   }
 
   /**
-   * Returns true if the data has at least 6 tab-delimited fields _and_ 
-   * fields 4 and 5 are integer (start/end) 
+   * Returns true if the data has at least 6 tab-delimited fields _and_ fields 4
+   * and 5 are integer (start/end)
+   * 
    * @param data
    * @return
    */
@@ -382,14 +400,17 @@ public class IdentifyFile
       return false;
     }
     String[] columns = data.split("\t");
-    if (columns.length < 6) {
+    if (columns.length < 6)
+    {
       return false;
     }
     for (int col = 3; col < 5; col++)
     {
-      try {
+      try
+      {
         Integer.parseInt(columns[col]);
-      } catch (NumberFormatException e) {
+      } catch (NumberFormatException e)
+      {
         return false;
       }
     }
@@ -407,9 +428,9 @@ public class IdentifyFile
         type = ider.identify(args[i], DataSourceType.FILE);
       } catch (FileFormatException e)
       {
-        System.err.println(String.format(
-                "Error '%s' identifying file type for %s", args[i],
-                e.getMessage()));
+        System.err.println(
+                String.format("Error '%s' identifying file type for %s",
+                        args[i], e.getMessage()));
       }
       System.out.println("Type of " + args[i] + " is " + type);
     }