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
Merge branch 'documentation/JAL-2325_release2101' into develop
[jalview.git]
/
src
/
jalview
/
io
/
FastaFile.java
diff --git
a/src/jalview/io/FastaFile.java
b/src/jalview/io/FastaFile.java
index
7585758
..
ec1c82e
100755
(executable)
--- a/
src/jalview/io/FastaFile.java
+++ b/
src/jalview/io/FastaFile.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * 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.
*
*
* This file is part of Jalview.
*
@@
-77,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();
@@
-173,8
+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
- .elementAt(i);
+ AlignmentAnnotation aa = annotations.elementAt(i);
aa.setPadGaps(true, al.getGapCharacter());
al.addAnnotation(aa);
}
aa.setPadGaps(true, al.getGapCharacter());
al.addAnnotation(aa);
}
@@
-209,7
+209,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++)
{
@@
-238,6
+239,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());