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 'develop' into features/JAL-2110_crossRefDuplications
[jalview.git]
/
src
/
jalview
/
io
/
MSFfile.java
diff --git
a/src/jalview/io/MSFfile.java
b/src/jalview/io/MSFfile.java
index
c81be4b
..
f62ad81
100755
(executable)
--- a/
src/jalview/io/MSFfile.java
+++ b/
src/jalview/io/MSFfile.java
@@
-20,11
+20,14
@@
*/
package jalview.io;
*/
package jalview.io;
-import java.io.*;
-import java.util.*;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceI;
+import jalview.util.Format;
-import jalview.datamodel.*;
-import jalview.util.*;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+import java.util.Vector;
/**
* DOCUMENT ME!
/**
* DOCUMENT ME!
@@
-63,13
+66,10
@@
public class MSFfile extends AlignFile
super(source);
}
super(source);
}
- {
- // TODO Auto-generated constructor stub
- }
-
/**
* DOCUMENT ME!
*/
/**
* DOCUMENT ME!
*/
+ @Override
public void parse() throws IOException
{
int i = 0;
public void parse() throws IOException
{
int i = 0;
@@
-344,12
+344,7
@@
public class MSFfile extends AlignFile
out.append(newline);
int len = 50;
out.append(newline);
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++)
{
@@
-411,6
+406,7
@@
public class MSFfile extends AlignFile
*
* @return DOCUMENT ME!
*/
*
* @return DOCUMENT ME!
*/
+ @Override
public String print()
{
return print(getSeqsAsArray());
public String print()
{
return print(getSeqsAsArray());