X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FIdentifyFile.java;h=4b6f8e40a9b0da997593a5f088033967ebfaf60d;hb=45e015aabe8f35a4a13be26e7630641ef8c94fbb;hp=89fc3cd2a1f31fe6a539541cdf890f64aafd8773;hpb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;p=jalview.git

diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index 89fc3cd..4b6f8e4 100755
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -30,8 +30,6 @@ import java.io.IOException;
  */
 public class IdentifyFile
 {
-  public static final String FeaturesFile = "GFF or Jalview features";
-
   /**
    * Identify a datasource's file content.
    *
@@ -74,6 +72,13 @@ public class IdentifyFile
     // preserves original behaviour prior to version 2.3
   }
 
+  public FileFormatI identify(AlignmentFileReaderI file, boolean closeSource)
+          throws IOException
+  {
+    FileParse fp = new FileParse(file.getInFile(), file.getDataSourceType());
+    return identify(fp, closeSource);
+  }
+
   /**
    * Identify contents of source, closing it or resetting source to start
    * afterwards.
@@ -136,6 +141,11 @@ public class IdentifyFile
         }
         data = data.toUpperCase();
 
+        if (data.startsWith(ScoreMatrixFile.SCOREMATRIX))
+        {
+          reply = FileFormat.ScoreMatrix;
+          break;
+        }
         if (data.startsWith("##GFF-VERSION"))
         {
           // GFF - possibly embedded in a Jalview features file!
@@ -254,7 +264,7 @@ public class IdentifyFile
         }
         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"))
@@ -343,6 +353,7 @@ public class IdentifyFile
               .println("File Identification failed! - Empty file was read.");
       throw new FileFormatException("EMPTY DATA FILE");
     }
+    System.out.println("File format identified as " + reply.toString());
     return reply;
   }
 
@@ -364,8 +375,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
    */
@@ -376,14 +388,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;
       }
     }