X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FIdentifyFile.java;h=f80b3caff199e84e0403035b2466a618e4d9856d;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=b06edc560056e357c7d97cac5c4aa17937b60279;hpb=ad20cd92225f2ee8c251d39b00b90555d382a616;p=jalview.git diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java index b06edc5..f80b3ca 100755 --- 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 . + * 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 }