X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FSimpleBlastFile.java;h=ba6b2f3606db2758e4ecffc444318a3b7aec9f0f;hb=c6018dc0dc12720e13b75850a5303279ac7094b7;hp=f4dc5a2a89a3383384d452a21b9e63b05a464f66;hpb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;p=jalview.git diff --git a/src/jalview/io/SimpleBlastFile.java b/src/jalview/io/SimpleBlastFile.java index f4dc5a2..ba6b2f3 100644 --- a/src/jalview/io/SimpleBlastFile.java +++ b/src/jalview/io/SimpleBlastFile.java @@ -51,9 +51,10 @@ public class SimpleBlastFile extends AlignFile { } - public SimpleBlastFile(String inFile, String type) throws IOException + public SimpleBlastFile(String inFile, DataSourceType sourceType) + throws IOException { - super(inFile, type); + super(inFile, sourceType); } public SimpleBlastFile(FileParse source) throws IOException @@ -61,6 +62,7 @@ public class SimpleBlastFile extends AlignFile super(source); } + @Override public void initData() { super.initData(); @@ -69,6 +71,7 @@ public class SimpleBlastFile extends AlignFile seqids = new Vector(); } + @Override public void parse() throws IOException { String line; @@ -162,8 +165,8 @@ public class SimpleBlastFile extends AlignFile rstart = Long.parseLong(stindx); } catch (Exception e) { - System.err.println("Couldn't parse '" + stindx - + "' as start of row"); + System.err.println( + "Couldn't parse '" + stindx + "' as start of row"); // inAlignments = false; // warn for this line } @@ -172,8 +175,8 @@ public class SimpleBlastFile extends AlignFile rend = Long.parseLong(endindx); } catch (Exception e) { - System.err.println("Couldn't parse '" + endindx - + "' as end of row"); + System.err.println( + "Couldn't parse '" + endindx + "' as end of row"); // inAlignments = false; // warn for this line @@ -201,7 +204,8 @@ public class SimpleBlastFile extends AlignFile { padseq = true; // prepend gaps to new sequences in this block seqentry = new Object[] { new StringBuffer(), - new long[] { rstart, rend } }; + new long[] + { rstart, rend } }; seqentries.addElement(seqentry); seqhash.put(sqid, seqentry); @@ -255,7 +259,7 @@ public class SimpleBlastFile extends AlignFile { Sequence newseq = new Sequence(idstring, - ((StringBuffer) seqentry[0]).toString(), + ((StringBuffer) seqentry[0]).toString(), (int) ((long[]) seqentry[1])[0], (int) ((long[]) seqentry[1])[1]); if (newseq.getEnd() == 0) @@ -286,13 +290,9 @@ public class SimpleBlastFile extends AlignFile } } - public String print(SequenceI[] s) + @Override + public String print(SequenceI[] sqs, boolean jvsuffix) { return new String("Not Implemented."); } - - public String print() - { - return print(getSeqsAsArray()); - } }