X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FMSFfile.java;h=c81be4b97a44153891f9a84aba4a47e3d06cd18f;hb=ad15cff29620f960119f80176f1fd443da9f6763;hp=161634c3cb56041d1704c358b8e2d29f8d6fe84c;hpb=d7c00f48b00e3ede57c46ae4daf6a9203b9b6059;p=jalview.git diff --git a/src/jalview/io/MSFfile.java b/src/jalview/io/MSFfile.java index 161634c..c81be4b 100755 --- a/src/jalview/io/MSFfile.java +++ b/src/jalview/io/MSFfile.java @@ -1,34 +1,28 @@ /* - * 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-Rel$$) + * Copyright (C) $$Year-Rel$$ 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 javax.xml.parsers.ParserConfigurationException; - -import org.xml.sax.SAXException; - -import fr.orsay.lri.varna.exceptions.ExceptionFileFormatOrSyntax; -import fr.orsay.lri.varna.exceptions.ExceptionLoadingFailed; -import fr.orsay.lri.varna.exceptions.ExceptionPermissionDenied; -import fr.orsay.lri.varna.exceptions.ExceptionUnmatchedClosingParentheses; - import jalview.datamodel.*; import jalview.util.*; @@ -58,20 +52,13 @@ public class MSFfile extends AlignFile * * @throws IOException * DOCUMENT ME! - * @throws SAXException - * @throws ParserConfigurationException - * @throws ExceptionFileFormatOrSyntax - * @throws ExceptionLoadingFailed - * @throws ExceptionPermissionDenied - * @throws InterruptedException - * @throws ExceptionUnmatchedClosingParentheses */ - public MSFfile(String inFile, String type) throws IOException, ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed, InterruptedException, ExceptionUnmatchedClosingParentheses + public MSFfile(String inFile, String type) throws IOException { super(inFile, type); } - public MSFfile(FileParse source) throws IOException, ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed, InterruptedException, ExceptionUnmatchedClosingParentheses + public MSFfile(FileParse source) throws IOException { super(source); } @@ -233,7 +220,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; @@ -244,7 +231,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()); @@ -317,7 +304,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) { @@ -351,7 +338,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;