JAL-3032 DND enabled; additional io changes for File vs. String

[jalview.git] / src / jalview / io / IdentifyFile.java

diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index ff959b0..8fa76ec 100755 (executable)
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -20,6 +20,7 @@
  */
 package jalview.io;
 
+import java.io.File;
 import java.io.IOException;
 
 /**
@@ -30,6 +31,40 @@ import java.io.IOException;
  */
 public class IdentifyFile
 {
+  
+  public FileFormatI identify(Object file, DataSourceType protocol) throws FileFormatException
+  {
+    // BH 2018
+    return (file instanceof File ? identify((File) file, protocol) : identify((String) file, protocol));
+    
+  }
+
+  public FileFormatI identify(File file, DataSourceType sourceType)
+          throws FileFormatException
+  {
+    // BH 2018
+    String emessage = "UNIDENTIFIED FILE PARSING ERROR";
+    FileParse parser = null;
+    try
+    {
+      parser = new FileParse(file, sourceType);
+      if (parser.isValid())
+      {
+        return identify(parser);
+      }
+    } catch (Exception e)
+    {
+      System.err.println("Error whilst identifying " + file);
+      e.printStackTrace(System.err);
+      emessage = e.getMessage();
+    }
+    if (parser != null)
+    {
+      throw new FileFormatException(parser.errormessage);
+    }
+    throw new FileFormatException(emessage);
+  }
+
   /**
    * Identify a datasource's file content.
    *
@@ -55,7 +90,7 @@ public class IdentifyFile
       }
     } catch (Exception e)
     {
-      System.err.println("Error whilst identifying");
+      System.err.println("Error whilst identifying " + file);
       e.printStackTrace(System.err);
       emessage = e.getMessage();
     }
@@ -439,4 +474,6 @@ public class IdentifyFile
       System.err.println("Usage: <Filename> [<Filename> ...]");
     }
   }
+
+ 
 }