X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FIdentifyFile.java;h=9a248e5abe40694c229844e40d6ec84c9e00889a;hb=f3581eb4882e66b7d66a9573be5103358196fd2d;hp=6b32fe1a867d4214efd90b7a08e5943bfedbd72f;hpb=a853fae4d9d4dbc80e877741c017fca7ee80c59e;p=jalview.git

diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index 6b32fe1..9a248e5 100755
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -1,6 +1,6 @@
 /*
 * Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -76,6 +76,13 @@ public class IdentifyFile
             {
                 data = data.toUpperCase();
 
+                if ( (data.indexOf("# STOCKHOLM") > -1))
+                {
+                  reply = "STH";
+
+                  break;
+                }
+
                 if ((data.indexOf("#") == 0) || (data.length() < 1))
                 {
                     continue;
@@ -125,13 +132,19 @@ public class IdentifyFile
                     }
 
                     break;
-                }
-                else if (data.indexOf(":")<data.indexOf(",")) //  && data.indexOf(",")<data.indexOf(",", data.indexOf(",")))
-                {
-                  // file looks like a concise JNet file
-                  reply="JnetFile";
-                  break;
-                }
+                  }
+                  else if (data.indexOf("HEADER") > -1 ||
+                           data.indexOf("ATOM") > -1)
+                  {
+                    reply = "PDB";
+                    break;
+                  }
+                  else if (data.indexOf(":") < data.indexOf(",")) //  && data.indexOf(",")<data.indexOf(",", data.indexOf(",")))
+                  {
+                    // file looks like a concise JNet file
+                    reply = "JnetFile";
+                    break;
+                  }
             }
 
             reader.close();
@@ -141,6 +154,7 @@ public class IdentifyFile
             System.err.println("File Identification failed!\n" + ex);
             return error;
         }
+
         return reply;
     }
 }