X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAMSAFile.java;h=d8cb64fb51769775cfb1ec97b16d205ddf17bbe4;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=20cf7456b7c91093ff6278444cf6d961faee5827;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/io/AMSAFile.java b/src/jalview/io/AMSAFile.java index 20cf745..d8cb64f 100644 --- a/src/jalview/io/AMSAFile.java +++ b/src/jalview/io/AMSAFile.java @@ -1,24 +1,27 @@ /* - * 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.9) + * Copyright (C) 2015 The Jalview Authors * - * 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 + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.io; -import jalview.datamodel.*; +import jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.AlignmentI; public class AMSAFile extends jalview.io.FastaFile { @@ -61,7 +64,7 @@ public class AMSAFile extends jalview.io.FastaFile out.append(" " + aa.description); } - out.append("\n"); + out.append(newline); int nochunks = Math.min(aa.annotations.length, al.getWidth()) / len + 1; @@ -86,11 +89,15 @@ public class AMSAFile extends jalview.io.FastaFile { ch = aa.annotations[k].displayCharacter; } - + if (ch.length() > 1) + { + this.warningMessage = "Truncated column annotation to first letter."; + ch = ch.substring(0, 1); + } out.append(ch); } - out.append("\n"); + out.append(newline); } } }