X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFastaFile.java;h=0e964b33d14c9e9ba2a09844f6940f723fa9c120;hb=60403f610c291791bf7c58f9c7232206469687cd;hp=b3fb3a140fce8013edfd24676a3593ced1000223;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/io/FastaFile.java b/src/jalview/io/FastaFile.java index b3fb3a1..0e964b3 100755 --- a/src/jalview/io/FastaFile.java +++ b/src/jalview/io/FastaFile.java @@ -1,25 +1,25 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) - * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * 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 * - * This program 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 2 - * of the License, or (at your option) any later version. + * This file is part of Jalview. * - * This program 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. + * 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along with Jalview. If not, see . */ package jalview.io; import java.io.*; + import jalview.datamodel.*; /** @@ -48,12 +48,12 @@ public class FastaFile extends AlignFile * Creates a new FastaFile object. * * @param inFile - * DOCUMENT ME! + * DOCUMENT ME! * @param type - * DOCUMENT ME! + * DOCUMENT ME! * * @throws IOException - * DOCUMENT ME! + * DOCUMENT ME! */ public FastaFile(String inFile, String type) throws IOException { @@ -69,7 +69,7 @@ public class FastaFile extends AlignFile * DOCUMENT ME! * * @throws IOException - * DOCUMENT ME! + * DOCUMENT ME! */ public void parse() throws IOException { @@ -181,13 +181,13 @@ public class FastaFile extends AlignFile * DOCUMENT ME! * * @param s - * DOCUMENT ME! + * DOCUMENT ME! * @param len - * DOCUMENT ME! + * DOCUMENT ME! * @param gaps - * DOCUMENT ME! + * DOCUMENT ME! * @param displayId - * DOCUMENT ME! + * DOCUMENT ME! * * @return DOCUMENT ME! */ @@ -204,7 +204,7 @@ public class FastaFile extends AlignFile out.append(" " + s[i].getDescription()); } - out.append("\n"); + out.append(newline); int nochunks = (s[i].getLength() / len) + 1; @@ -215,12 +215,12 @@ public class FastaFile extends AlignFile if (end < s[i].getLength()) { - out.append(s[i].getSequenceAsString(start, end) + "\n"); + out.append(s[i].getSequenceAsString(start, end) + newline); } else if (start < s[i].getLength()) { out.append(s[i].getSequenceAsString(start, s[i].getLength()) - + "\n"); + + newline); } }