X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FPIRFile.java;h=fcd790e8880ae161c64cb8dc9b5057c50fb90d22;hb=e601d78bc7762386f570e346a803684c43a66ff1;hp=7a46d21afb5c5983445ec00e5d4f22a5a3ba2020;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/io/PIRFile.java b/src/jalview/io/PIRFile.java index 7a46d21..fcd790e 100755 --- a/src/jalview/io/PIRFile.java +++ b/src/jalview/io/PIRFile.java @@ -1,20 +1,19 @@ /* - * 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.6) + * Copyright (C) 2010 J Procter, AM Waterhouse, 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. * - * 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 + * 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 . */ package jalview.io; @@ -128,16 +127,19 @@ public class PIRFile extends AlignFile // tRNA N3 // other functional RNA N1 - out.append(">N1;" + s[i].getName() + "\n"); + out.append(">N1;" + s[i].getName()); + out.append(newline); if (s[i].getDescription() == null) { out.append(s[i].getName() + " " + (s[i].getEnd() - s[i].getStart() + 1)); - out.append(is_NA ? " bases\n" : " residues\n"); + out.append(is_NA ? " bases" : " residues"); + out.append(newline); } else { - out.append(s[i].getDescription() + "\n"); + out.append(s[i].getDescription()); + out.append(newline); } } else @@ -145,23 +147,26 @@ public class PIRFile extends AlignFile if (useModellerOutput) { - out.append(">P1;" + s[i].getName() + "\n"); + out.append(">P1;" + s[i].getName()); + out.append(newline); md = new ModellerDescription(s[i]); - out.append(md.getDescriptionLine() + "\n"); + out.append(md.getDescriptionLine()); + out.append(newline); } else { - out.append(">P1;" + printId(s[i]) + "\n"); + out.append(">P1;" + printId(s[i])); + out.append(newline); if (s[i].getDescription() != null) { - out.append(s[i].getDescription() + "\n"); + out.append(s[i].getDescription()); + out.append(newline); } else { - out - .append(s[i].getName() + " " - + (s[i].getEnd() - s[i].getStart() + 1) - + " residues\n"); + out.append(s[i].getName() + " " + + (s[i].getEnd() - s[i].getStart() + 1) + " residues"); + out.append(newline); } } } @@ -174,11 +179,13 @@ public class PIRFile extends AlignFile if (end < seq.length()) { - out.append(seq.substring(start, end) + "\n"); + out.append(seq.substring(start, end)); + out.append(newline); } else if (start < seq.length()) { - out.append(seq.substring(start) + "\n"); + out.append(seq.substring(start)); + out.append(newline); } }