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-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git]
/
src
/
jalview
/
io
/
PileUpfile.java
diff --git
a/src/jalview/io/PileUpfile.java
b/src/jalview/io/PileUpfile.java
index
6f7ccc2
..
79c6531
100755
(executable)
--- a/
src/jalview/io/PileUpfile.java
+++ b/
src/jalview/io/PileUpfile.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * 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.
*
@@
-76,11
+76,13
@@
public class PileUpfile extends MSFfile
*
* @return DOCUMENT ME!
*/
*
* @return DOCUMENT ME!
*/
+ @Override
public String print()
{
return print(getSeqsAsArray());
}
public String print()
{
return print(getSeqsAsArray());
}
+ @Override
public String print(SequenceI[] s)
{
StringBuffer out = new StringBuffer("PileUp");
public String print(SequenceI[] s)
{
StringBuffer out = new StringBuffer("PileUp");
@@
-141,12
+143,7
@@
public class PileUpfile extends MSFfile
int len = 50;
int len = 50;
- int nochunks = (max / len) + 1;
-
- if ((max % len) == 0)
- {
- nochunks--;
- }
+ int nochunks = (max / len) + (max % len > 0 ? 1 : 0);
for (i = 0; i < nochunks; i++)
{
for (i = 0; i < nochunks; i++)
{