X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FMSFfile.java;h=67ace7c226dcf08784bdb37d5b67e3f2ba28c390;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=7c2e1b24bab651830aade74c48ca670f74eee245;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git diff --git a/src/jalview/io/MSFfile.java b/src/jalview/io/MSFfile.java index 7c2e1b2..67ace7c 100755 --- a/src/jalview/io/MSFfile.java +++ b/src/jalview/io/MSFfile.java @@ -1,27 +1,33 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 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. - * + * 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 . + * 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.util.*; +import jalview.datamodel.Sequence; +import jalview.datamodel.SequenceI; +import jalview.util.Format; -import jalview.datamodel.*; -import jalview.util.*; +import java.io.IOException; +import java.util.Hashtable; +import java.util.StringTokenizer; +import java.util.Vector; /** * DOCUMENT ME! @@ -60,10 +66,6 @@ public class MSFfile extends AlignFile super(source); } - { - // TODO Auto-generated constructor stub - } - /** * DOCUMENT ME! */ @@ -217,7 +219,7 @@ public class MSFfile extends AlignFile StringBuffer out = new StringBuffer("!!" + (is_NA ? "NA" : "AA") + "_MULTIPLE_ALIGNMENT 1.0"); - // TODO: JBPNote : Jalview doesn't remember NA or AA yet. + // TODO: JBPNote : Jalview doesn't remember NA or AA yet. out.append(newline); out.append(newline); int max = 0; @@ -228,7 +230,7 @@ public class MSFfile extends AlignFile { // Replace all internal gaps with . and external spaces with ~ s[i] = new Sequence(seqs[i].getName(), seqs[i].getSequenceAsString() - .replace('-', '.'), seqs[i].getStart(),seqs[i].getEnd()); + .replace('-', '.'), seqs[i].getStart(), seqs[i].getEnd()); StringBuffer sb = new StringBuffer(); sb.append(s[i].getSequence()); @@ -301,7 +303,7 @@ public class MSFfile extends AlignFile idBlock[i] = new String("Len: " + maxLenpad.form(s[i].getSequence().length) + " Check: " - + maxChkpad.form(checksums[i]) + " Weight: 1.00"+newline); + + maxChkpad.form(checksums[i]) + " Weight: 1.00" + newline); if (s[i].getName().length() > maxid) { @@ -335,7 +337,8 @@ public class MSFfile extends AlignFile maxid++; out.append(newline); - out.append(newline);out.append("//"); + out.append(newline); + out.append("//"); out.append(newline); out.append(newline); int len = 50;