X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FPhylipFile.java;h=e1d82ee0303c7ee63640af9e87a581e61f6f8c6e;hb=e6798fd04b1d7a35836a2e84deae5a94a35b88b9;hp=2c8beae5e0e95520880cfabe1385d41b1b43f449;hpb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;p=jalview.git diff --git a/src/jalview/io/PhylipFile.java b/src/jalview/io/PhylipFile.java index 2c8beae..e1d82ee 100644 --- a/src/jalview/io/PhylipFile.java +++ b/src/jalview/io/PhylipFile.java @@ -240,15 +240,15 @@ public class PhylipFile extends AlignFile * @see {@link AlignFile#print()} */ @Override - public String print() + public String print(SequenceI[] sqs, boolean jvsuffix) { - StringBuffer sb = new StringBuffer(Integer.toString(seqs.size())); + StringBuffer sb = new StringBuffer(Integer.toString(sqs.length)); sb.append(" "); // if there are no sequences, then define the number of characters as 0 sb.append( - (seqs.size() > 0) ? Integer - .toString(seqs.get(0).getSequence().length) : "0") +(sqs.length > 0) ? Integer.toString(sqs[0].getLength()) + : "0") .append(newline); // Due to how IO is handled, there doesn't appear to be a way to store @@ -260,7 +260,7 @@ public class PhylipFile extends AlignFile int numInterleavedColumns = 60; int sequenceLength = 0; - for (SequenceI s : seqs) + for (SequenceI s : sqs) { // ensure name is only 10 characters @@ -279,13 +279,13 @@ public class PhylipFile extends AlignFile // sequential has the entire sequence following the name if (sequential) { - sb.append(s.getSequence()); + sb.append(s.getSequenceAsString()); } else { // Jalview ensures all sequences are of same length so no need // to keep track of min/max length - sequenceLength = s.getSequence().length; + sequenceLength = s.getLength(); // interleaved breaks the sequence into chunks for // interleavedColumns characters sb.append(s.getSequence(0, @@ -311,7 +311,7 @@ public class PhylipFile extends AlignFile // add blank line to separate this matrix from previous sb.append(newline); int start = i * numInterleavedColumns; - for (SequenceI s : seqs) + for (SequenceI s : sqs) { sb.append( s.getSequence(start, Math.min(start