X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FPIRFile.java;h=d9ed5166d9f88d04d0818007dc6114cd8f297b7f;hb=92d66803db3319c4db605177d502de91302ef684;hp=a26bc46fe69210188546d202a28ae0efa6ca7bb2;hpb=db93a1adcbe0a4eaaf06e0a70ade0d6c5c1961c3;p=jalview.git diff --git a/src/jalview/io/PIRFile.java b/src/jalview/io/PIRFile.java index a26bc46..d9ed516 100755 --- a/src/jalview/io/PIRFile.java +++ b/src/jalview/io/PIRFile.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -22,6 +22,7 @@ package jalview.io; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceI; +import jalview.util.Comparison; import java.io.IOException; import java.util.Vector; @@ -36,9 +37,10 @@ public class PIRFile extends AlignFile { } - public PIRFile(String inFile, String type) throws IOException + public PIRFile(String inFile, DataSourceType sourceType) + throws IOException { - super(inFile, type); + super(inFile, sourceType); } public PIRFile(FileParse source) throws IOException @@ -102,14 +104,9 @@ public class PIRFile extends AlignFile } @Override - public String print() + public String print(SequenceI[] s, boolean jvsuffix) { - return print(getSeqsAsArray()); - } - - public String print(SequenceI[] s) - { - boolean is_NA = jalview.util.Comparison.isNucleotide(s); + boolean is_NA = Comparison.isNucleotide(s); int len = 72; StringBuffer out = new StringBuffer(); int i = 0; @@ -161,7 +158,7 @@ public class PIRFile extends AlignFile } else { - out.append(">P1;" + printId(s[i])); + out.append(">P1;" + printId(s[i], jvsuffix)); out.append(newline); if (s[i].getDescription() != null) {