X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FBLCFile.java;h=c0ecd580e2b3329ef3d1f172acdbf6bf1fcd8b11;hb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;hp=7b080a4f4ab00e4d0551fc9e2440132b41d2e469;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git diff --git a/src/jalview/io/BLCFile.java b/src/jalview/io/BLCFile.java index 7b080a4..c0ecd58 100755 --- a/src/jalview/io/BLCFile.java +++ b/src/jalview/io/BLCFile.java @@ -1,26 +1,30 @@ /* - * 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-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 jalview.datamodel.Sequence; +import jalview.datamodel.SequenceI; -import jalview.datamodel.*; +import java.io.IOException; +import java.util.Vector; /** * DOCUMENT ME! @@ -44,15 +48,16 @@ public class BLCFile extends AlignFile * * @param inFile * DOCUMENT ME! - * @param type + * @param sourceType * DOCUMENT ME! * * @throws IOException * DOCUMENT ME! */ - public BLCFile(String inFile, String type) throws IOException + public BLCFile(String inFile, DataSourceType sourceType) + throws IOException { - super(inFile, type); + super(inFile, sourceType); } public BLCFile(FileParse source) throws IOException @@ -63,6 +68,7 @@ public class BLCFile extends AlignFile /** * DOCUMENT ME! */ + @Override public void initData() { super.initData(); @@ -85,6 +91,7 @@ public class BLCFile extends AlignFile /** * DOCUMENT ME! */ + @Override public void parse() throws IOException { StringBuffer headerLines = new StringBuffer(); @@ -112,7 +119,9 @@ public class BLCFile extends AlignFile { line = nextLine(); if (line == null) + { break; + } // seek end of ids if (line.indexOf("*") > -1) { @@ -147,7 +156,9 @@ public class BLCFile extends AlignFile } } while (!idsFound); if (line == null) + { break; // end of file. + } int starCol = line.indexOf("*"); seqstrings = new StringBuffer[seqs.size()]; @@ -195,9 +206,11 @@ public class BLCFile extends AlignFile } if (seqs.size() > 0) { - if (headerLines.length() > 1 + numHeaderLines) // could see if buffer is + if (headerLines.length() > 1 + numHeaderLines) + { // just whitespace or not. setAlignmentProperty("Comments", headerLines.toString()); + } setAlignmentProperty("iteration", "" + iterationCount); } } @@ -207,6 +220,7 @@ public class BLCFile extends AlignFile * * @return DOCUMENT ME! */ + @Override public String print() { return print(getSeqsAsArray());