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-3253-applet JAL-3383
[jalview.git]
/
src
/
jalview
/
io
/
FeaturesFile.java
diff --git
a/src/jalview/io/FeaturesFile.java
b/src/jalview/io/FeaturesFile.java
index
d51da33
..
aa21b0f
100755
(executable)
--- a/
src/jalview/io/FeaturesFile.java
+++ b/
src/jalview/io/FeaturesFile.java
@@
-829,14
+829,15
@@
public class FeaturesFile extends AlignFile implements FeaturesSourceI
AlignViewportI av = getViewport();
if (av != null)
{
AlignViewportI av = getViewport();
if (av != null)
{
- if (av.getAlignment() != null)
+ AlignmentI a = av.getAlignment();
+ if (a != null)
{
{
- dataset = av.getAlignment().getDataset();
+ dataset = a.getDataset();
}
if (dataset == null)
{
// working in the applet context ?
}
if (dataset == null)
{
// working in the applet context ?
- dataset = av.getAlignment();
+ dataset = a;
}
}
else
}
}
else
@@
-890,7
+891,8
@@
public class FeaturesFile extends AlignFile implements FeaturesSourceI
StringBuilder out = new StringBuilder(256);
StringBuilder out = new StringBuilder(256);
- out.append(String.format("%s %d\n", GFF_VERSION, gffVersion == 0 ? 2 : gffVersion));
+ out.append(String.format("%s %d" + newline, GFF_VERSION,
+ gffVersion == 0 ? 2 : gffVersion));
if (!includeNonPositionalFeatures
&& (visibleColours == null || visibleColours.isEmpty()))
if (!includeNonPositionalFeatures
&& (visibleColours == null || visibleColours.isEmpty()))