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-3509 JAL-1842 minor tidying of code
[jalview.git]
/
src
/
jalview
/
io
/
FastaFile.java
diff --git
a/src/jalview/io/FastaFile.java
b/src/jalview/io/FastaFile.java
index
bbc5a7e
..
9acd7da
100755
(executable)
--- a/
src/jalview/io/FastaFile.java
+++ b/
src/jalview/io/FastaFile.java
@@
-72,6
+72,11
@@
public class FastaFile extends AlignFile
super(source);
}
super(source);
}
+ public FastaFile(SequenceI[] seqs)
+ {
+ super(seqs);
+ }
+
/**
* DOCUMENT ME!
*
/**
* DOCUMENT ME!
*
@@
-159,8
+164,8
@@
public class FastaFile extends AlignFile
anots[i] = new Annotation("" + cn, null, ' ', Float.NaN);
}
}
anots[i] = new Annotation("" + cn, null, ' ', Float.NaN);
}
}
- AlignmentAnnotation aa = new AlignmentAnnotation(seq.getName()
- .substring(2), seq.getDescription(), anots);
+ AlignmentAnnotation aa = new AlignmentAnnotation(
+ seq.getName().substring(2), seq.getDescription(), anots);
return aa;
}
return aa;
}
@@
-175,35
+180,21
@@
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 = annotations
- .elementAt(i);
+ AlignmentAnnotation aa = annotations.elementAt(i);
aa.setPadGaps(true, al.getGapCharacter());
al.addAnnotation(aa);
}
}
aa.setPadGaps(true, al.getGapCharacter());
al.addAnnotation(aa);
}
}
- /**
- * DOCUMENT ME!
- *
- * @param s
- * DOCUMENT ME!
- * @param len
- * DOCUMENT ME!
- * @param gaps
- * DOCUMENT ME!
- * @param displayId
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public String print(SequenceI[] s)
+ @Override
+ public String print(SequenceI[] s, boolean jvsuffix)
{
out = new StringBuffer();
int i = 0;
while ((i < s.length) && (s[i] != null))
{
{
out = new StringBuffer();
int i = 0;
while ((i < s.length) && (s[i] != null))
{
- out.append(">" + printId(s[i]));
+ out.append(">" + printId(s[i], jvsuffix));
if (s[i].getDescription() != null)
{
out.append(" " + s[i].getDescription());
if (s[i].getDescription() != null)
{
out.append(" " + s[i].getDescription());
@@
-235,15
+226,4
@@
public class FastaFile extends AlignFile
return out.toString();
}
return out.toString();
}
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- @Override
- public String print()
- {
- return print(getSeqsAsArray());
- }
}
}