X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FPIRFile.java;h=5f5c23c4c834e4f79788f56bb3a93e454ba65996;hb=c708b0d5bed26752c34e62960f0acdeada8742df;hp=5bc7bd5928b6c29a17ab9b13f7c19c466fb5ab36;hpb=a7f8fa9c06d82efbbdbc6a0bf1054bb21610b353;p=jalview.git diff --git a/src/jalview/io/PIRFile.java b/src/jalview/io/PIRFile.java index 5bc7bd5..5f5c23c 100755 --- a/src/jalview/io/PIRFile.java +++ b/src/jalview/io/PIRFile.java @@ -1,34 +1,30 @@ /* - * 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 jalview.datamodel.Sequence; +import jalview.datamodel.SequenceI; -import jalview.datamodel.*; +import java.io.IOException; +import java.util.Vector; public class PIRFile extends AlignFile { @@ -40,16 +36,17 @@ public class PIRFile extends AlignFile { } - public PIRFile(String inFile, String type) throws IOException, ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed + public PIRFile(String inFile, String type) throws IOException { super(inFile, type); } - public PIRFile(FileParse source) throws IOException, ExceptionFileFormatOrSyntax, ParserConfigurationException, SAXException, ExceptionPermissionDenied, ExceptionLoadingFailed + public PIRFile(FileParse source) throws IOException { super(source); } + @Override public void parse() throws IOException { StringBuffer sequence; @@ -104,6 +101,7 @@ public class PIRFile extends AlignFile } } + @Override public String print() { return print(getSeqsAsArray()); @@ -178,7 +176,8 @@ public class PIRFile extends AlignFile } } } - int nochunks = (seq.length() / len) + 1; + int nochunks = (seq.length() / len) + + (seq.length() % len > 0 ? 1 : 0); for (int j = 0; j < nochunks; j++) {