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-653 AlignedCodonFrame collections changed from Set to List
[jalview.git]
/
src
/
jalview
/
appletgui
/
AlignViewport.java
diff --git
a/src/jalview/appletgui/AlignViewport.java
b/src/jalview/appletgui/AlignViewport.java
index
e434825
..
7ef2d59
100644
(file)
--- a/
src/jalview/appletgui/AlignViewport.java
+++ b/
src/jalview/appletgui/AlignViewport.java
@@
-187,8
+187,13
@@
public class AlignViewport extends AlignmentViewport implements
if (applet != null)
{
if (applet != null)
{
- String colour = applet.getParameter("defaultColour");
-
+ String colour = al.isNucleotide() ? applet
+ .getParameter("defaultColourNuc") : applet
+ .getParameter("defaultColourProt");
+ if (colour == null)
+ {
+ colour = applet.getParameter("defaultColour");
+ }
if (colour == null)
{
colour = applet.getParameter("userDefinedColour");
if (colour == null)
{
colour = applet.getParameter("userDefinedColour");