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 bug/JAL-2255_seq-fetcher-broken-on-linux
[jalview.git]
/
src
/
jalview
/
ws
/
jws1
/
Annotate3D.java
diff --git
a/src/jalview/ws/jws1/Annotate3D.java
b/src/jalview/ws/jws1/Annotate3D.java
index
8c30c69
..
bae0357
100644
(file)
--- a/
src/jalview/ws/jws1/Annotate3D.java
+++ b/
src/jalview/ws/jws1/Annotate3D.java
@@
-21,6
+21,7
@@
package jalview.ws.jws1;
import jalview.datamodel.AlignmentI;
package jalview.ws.jws1;
import jalview.datamodel.AlignmentI;
+import jalview.io.FileFormat;
import jalview.io.FileParse;
import jalview.io.FormatAdapter;
import jalview.io.InputStreamParser;
import jalview.io.FileParse;
import jalview.io.FormatAdapter;
import jalview.io.InputStreamParser;
@@
-86,7
+87,8
@@
public class Annotate3D
while (r.hasNext())
{
FileParse fp = new InputStreamParser(r.next(), source.getDataName());
while (r.hasNext())
{
FileParse fp = new InputStreamParser(r.next(), source.getDataName());
- AlignmentI nal = new FormatAdapter().readFromFile(fp, "RNAML");
+ AlignmentI nal = new FormatAdapter().readFromFile(fp,
+ FileFormat.Rnaml);
if (al == null)
{
al = nal;
if (al == null)
{
al = nal;