JAL-1517 update copyright to version 2.8.2

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

diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index b06edc5..f80b3ca 100755 (executable)
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -14,6 +14,7 @@
  * PURPOSE.  See the GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.io;
 
@@ -131,6 +132,13 @@ public class IdentifyFile
 
           break;
         }
+        
+        if ((data.indexOf("<") > -1))
+        {
+          reply = "RNAML";
+          
+          break;
+        }
 
         if ((data.length() < 1) || (data.indexOf("#") == 0))
         {
@@ -159,6 +167,8 @@ public class IdentifyFile
 
           break;
         }
+        
+        
         else if (data.indexOf(">") > -1)
         {
           // FASTA, PIR file or BLC file
@@ -181,16 +191,19 @@ public class IdentifyFile
             // Is this a single line BLC file?
             String data1 = source.nextLine();
             String data2 = source.nextLine();
+            int c1;
             if (checkPIR)
             {
               starterm = (data1 != null && data1.indexOf("*") > -1)
                       || (data2 != null && data2.indexOf("*") > -1);
             }
-            if (data2 != null && data.indexOf("*") > -1)
+            if (data2 != null && (c1=data.indexOf("*")) > -1)
             {
-              if (data.indexOf("*") == data2.indexOf("*"))
+              if (c1==0 && c1 == data2.indexOf("*"))
               {
                 reply = "BLC";
+              } else {
+                reply = "FASTA"; // possibly a bad choice - may be recognised as PIR 
               }
               // otherwise can still possibly be a PIR file
             }