X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FPfamFile.java;h=bc22fae2933693a7dec73c3ed1a5c81b12ad7a92;hb=2e18e422cead591bd9a1df295f1897b3e346a480;hp=59ffbaac3439852f5c19218832ebcc0078b0c067;hpb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;p=jalview.git diff --git a/src/jalview/io/PfamFile.java b/src/jalview/io/PfamFile.java index 59ffbaa..bc22fae 100755 --- a/src/jalview/io/PfamFile.java +++ b/src/jalview/io/PfamFile.java @@ -109,7 +109,7 @@ public class PfamFile extends AlignFile } if (spces + 1 < line.length()) { - tempseq.append(line.substring(spces + 1)); + tempseq.append(line.substring(spces + 1).trim()); } } @@ -125,8 +125,7 @@ public class PfamFile extends AlignFile { if (seqhash.get(headers.get(i)) != null) { - if (maxLength < seqhash.get(headers.get(i)).toString() - .length()) + if (maxLength < seqhash.get(headers.get(i)).toString().length()) { maxLength = seqhash.get(headers.get(i)).toString().length(); } @@ -144,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(""); @@ -155,7 +155,7 @@ 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) { @@ -179,7 +179,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); @@ -190,10 +191,4 @@ public class PfamFile extends AlignFile return out.toString(); } - - @Override - public String print() - { - return print(getSeqsAsArray()); - } }