git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1991 bug fix for some flat-file printers to check for exact modulus in order...
[jalview.git]
/
src
/
jalview
/
io
/
FastaFile.java
diff --git
a/src/jalview/io/FastaFile.java
b/src/jalview/io/FastaFile.java
index
8dbfbfd
..
4c2265c
100755
(executable)
--- a/
src/jalview/io/FastaFile.java
+++ b/
src/jalview/io/FastaFile.java
@@
-20,9
+20,13
@@
*/
package jalview.io;
*/
package jalview.io;
-import java.io.*;
+import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.Annotation;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceI;
-import jalview.datamodel.*;
+import java.io.IOException;
/**
* DOCUMENT ME!
/**
* DOCUMENT ME!
@@
-73,6
+77,7
@@
public class FastaFile extends AlignFile
* @throws IOException
* DOCUMENT ME!
*/
* @throws IOException
* DOCUMENT ME!
*/
+ @Override
public void parse() throws IOException
{
StringBuffer sb = new StringBuffer();
public void parse() throws IOException
{
StringBuffer sb = new StringBuffer();
@@
-169,7
+174,7
@@
public class FastaFile extends AlignFile
addProperties(al);
for (int i = 0; i < annotations.size(); i++)
{
addProperties(al);
for (int i = 0; i < annotations.size(); i++)
{
- AlignmentAnnotation aa = (AlignmentAnnotation) annotations
+ AlignmentAnnotation aa = annotations
.elementAt(i);
aa.setPadGaps(true, al.getGapCharacter());
al.addAnnotation(aa);
.elementAt(i);
aa.setPadGaps(true, al.getGapCharacter());
al.addAnnotation(aa);
@@
-205,7
+210,8
@@
public class FastaFile extends AlignFile
out.append(newline);
out.append(newline);
- int nochunks = (s[i].getLength() / len) + 1;
+ int nochunks = (s[i].getLength() / len)
+ + (s[i].getLength() % len > 0 ? 1 : 0);
for (int j = 0; j < nochunks; j++)
{
for (int j = 0; j < nochunks; j++)
{
@@
-234,6
+240,7
@@
public class FastaFile extends AlignFile
*
* @return DOCUMENT ME!
*/
*
* @return DOCUMENT ME!
*/
+ @Override
public String print()
{
return print(getSeqsAsArray());
public String print()
{
return print(getSeqsAsArray());