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 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into...
[jalview.git]
/
src
/
jalview
/
io
/
AnnotationFile.java
diff --git
a/src/jalview/io/AnnotationFile.java
b/src/jalview/io/AnnotationFile.java
index
6b02022
..
aa29ced
100755
(executable)
--- a/
src/jalview/io/AnnotationFile.java
+++ b/
src/jalview/io/AnnotationFile.java
@@
-1617,8
+1617,10
@@
public class AnnotationFile
}
else if (key.equalsIgnoreCase("colour"))
{
}
else if (key.equalsIgnoreCase("colour"))
{
+ // TODO need to notify colourscheme of view reference once it is
+ // available
sg.cs.setColourScheme(
sg.cs.setColourScheme(
- ColourSchemeProperty.getColourScheme(al, value));
+ ColourSchemeProperty.getColourScheme(null, al, value));
}
else if (key.equalsIgnoreCase("pidThreshold"))
{
}
else if (key.equalsIgnoreCase("pidThreshold"))
{