X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FPileUpfile.java;h=79c6531ee68529bb793f00db9693f49446c15817;hb=743a0473c959092ec7c80bdb8169a541d33657cd;hp=95fb203dc623c4ffd92eb4b879dfb3a177a2cedd;hpb=1a8f953dd71a9e319e910261927f269d69b4692c;p=jalview.git diff --git a/src/jalview/io/PileUpfile.java b/src/jalview/io/PileUpfile.java index 95fb203..79c6531 100755 --- a/src/jalview/io/PileUpfile.java +++ b/src/jalview/io/PileUpfile.java @@ -1,19 +1,22 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) - * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, 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; @@ -32,19 +35,10 @@ package jalview.io; * found in Emboss (thanks David Martin!) * */ -import java.io.*; +import jalview.datamodel.SequenceI; +import jalview.util.Format; -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.*; +import java.io.IOException; public class PileUpfile extends MSFfile { @@ -63,14 +57,16 @@ public class PileUpfile extends MSFfile * DOCUMENT ME! * @param type * DOCUMENT ME! - * @throws Exception + * + * @throws IOException + * DOCUMENT ME! */ - public PileUpfile(String inFile, String type) throws Exception + public PileUpfile(String inFile, String type) throws IOException { super(inFile, type); } - public PileUpfile(FileParse source) throws Exception + public PileUpfile(FileParse source) throws IOException { super(source); } @@ -80,11 +76,13 @@ public class PileUpfile extends MSFfile * * @return DOCUMENT ME! */ + @Override public String print() { return print(getSeqsAsArray()); } + @Override public String print(SequenceI[] s) { StringBuffer out = new StringBuffer("PileUp"); @@ -145,12 +143,7 @@ public class PileUpfile extends MSFfile int len = 50; - int nochunks = (max / len) + 1; - - if ((max % len) == 0) - { - nochunks--; - } + int nochunks = (max / len) + (max % len > 0 ? 1 : 0); for (i = 0; i < nochunks; i++) {