trailing slash regexed out

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

diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index 7293ac6..46899da 100755 (executable)
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -40,6 +40,7 @@ public class IdentifyFile
    */
   public String Identify(String file, String protocol)
   {
+    String emessage = "UNIDENTIFIED FILE PARSING ERROR";
     FileParse parser = null;
     try {
       parser = new FileParse(file, protocol);
@@ -49,10 +50,11 @@ public class IdentifyFile
     } catch (Exception e) {
       System.err.println("Error whilst identifying");
       e.printStackTrace(System.err);
+      emessage = e.getMessage();
     }
     if (parser!=null)
       return parser.errormessage;
-    return "UNIDENTIFIED FILE PARSING ERROR";
+    return emessage;
   }
   public String Identify(FileParse source) {
     return Identify(source, true); // preserves original behaviour prior to version 2.3
@@ -70,6 +72,10 @@ 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();
+      }
       while ( (data = source.nextLine()) != null)
       {
         length+=data.length();
@@ -165,6 +171,7 @@ public class IdentifyFile
             else
             {
                 reply = "FASTA";
+                // TODO : AMSA File is indicated if there is annotation in the FASTA file - but FASTA will automatically generate this at the mo.
             }
           }
           break;