X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FIdentifyFile.java;h=93f9a98d9de79ed21124fa519e616e3bc30a079a;hb=dfa04e77181fccfa6229ffef1591fc9c622d9b39;hp=d30ed202e8ad00ef01e8bd49914cf5e8a7211036;hpb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;p=jalview.git diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java index d30ed20..93f9a98 100755 --- a/src/jalview/io/IdentifyFile.java +++ b/src/jalview/io/IdentifyFile.java @@ -1,24 +1,24 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) + * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * + * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * 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; import java.io.*; -import java.net.*; /** * DOCUMENT ME! @@ -182,16 +182,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 }