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 feature/r2_11_2/JAL-3808_gff2_exonerate
[jalview.git]
/
src
/
jalview
/
io
/
FileLoader.java
diff --git
a/src/jalview/io/FileLoader.java
b/src/jalview/io/FileLoader.java
index
3aa433e
..
3d2dded
100755
(executable)
--- a/
src/jalview/io/FileLoader.java
+++ b/
src/jalview/io/FileLoader.java
@@
-416,12
+416,9
@@
public class FileLoader implements Runnable
.getFeatureColourScheme();
if (viewport != null)
{
.getFeatureColourScheme();
if (viewport != null)
{
- if (proxyColourScheme != null)
- {
- viewport.applyFeaturesStyle(proxyColourScheme);
- }
// append to existing alignment
viewport.addAlignment(al, title);
// append to existing alignment
viewport.addAlignment(al, title);
+ viewport.applyFeaturesStyle(proxyColourScheme);
}
else
{
}
else
{
@@
-486,7
+483,7
@@
public class FileLoader implements Runnable
try
{
try
{
- alignFrame.setMaximum(jalview.bin.Cache
+ alignFrame.setMaximum(Cache
.getDefault("SHOW_FULLSCREEN", false));
} catch (java.beans.PropertyVetoException ex)
{
.getDefault("SHOW_FULLSCREEN", false));
} catch (java.beans.PropertyVetoException ex)
{