X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FPfamFile.java;h=9f152cc715791c8e15019ec1720bfb0fb3469448;hb=d065bc916cb63af83cdab7319f5177a855724aba;hp=e71bb4bec2188cfa7dd9326d89e532033a9b5694;hpb=853624fb32058cccc544ae7d13af6ad4b0800b6c;p=jalview.git diff --git a/src/jalview/io/PfamFile.java b/src/jalview/io/PfamFile.java index e71bb4b..9f152cc 100755 --- a/src/jalview/io/PfamFile.java +++ b/src/jalview/io/PfamFile.java @@ -36,9 +36,10 @@ public class PfamFile extends AlignFile { } - public PfamFile(String inFile, String type) throws IOException + public PfamFile(String inFile, DataSourceType sourceType) + throws IOException { - super(inFile, type); + super(inFile, sourceType); } public PfamFile(FileParse source) throws IOException @@ -142,7 +143,8 @@ public class PfamFile extends AlignFile } } - public String print(SequenceI[] s) + @Override + public String print(SequenceI[] s, boolean jvsuffix) { StringBuffer out = new StringBuffer(""); @@ -153,12 +155,9 @@ public class PfamFile extends AlignFile while ((i < s.length) && (s[i] != null)) { - String tmp = printId(s[i]); + String tmp = printId(s[i], jvsuffix); - if (s[i].getSequence().length > max) - { - max = s[i].getSequence().length; - } + max = Math.max(max, s[i].getLength()); if (tmp.length() > maxid) { @@ -177,7 +176,8 @@ public class PfamFile extends AlignFile while ((j < s.length) && (s[j] != null)) { - out.append(new Format("%-" + maxid + "s").form(printId(s[j]) + " ")); + out.append(new Format("%-" + maxid + "s") + .form(printId(s[j], jvsuffix) + " ")); out.append(s[j].getSequenceAsString()); out.append(newline); @@ -188,10 +188,4 @@ public class PfamFile extends AlignFile return out.toString(); } - - @Override - public String print() - { - return print(getSeqsAsArray()); - } }