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-2587 Removed dissolve
[jalview.git]
/
src
/
jalview
/
appletgui
/
SequenceRenderer.java
diff --git
a/src/jalview/appletgui/SequenceRenderer.java
b/src/jalview/appletgui/SequenceRenderer.java
index
b5586c9
..
38031e4
100755
(executable)
--- a/
src/jalview/appletgui/SequenceRenderer.java
+++ b/
src/jalview/appletgui/SequenceRenderer.java
@@
-69,8
+69,7
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
this.renderGaps = renderGaps;
}
this.renderGaps = renderGaps;
}
- @Override
- public Color getResidueBoxColour(SequenceI seq, int i)
+ protected Color getResidueBoxColour(SequenceI seq, int i)
{
allGroups = av.getAlignment().findAllGroups(seq);
{
allGroups = av.getAlignment().findAllGroups(seq);
@@
-116,7
+115,7
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
void getBoxColour(ResidueShaderI shader, SequenceI seq, int i)
{
void getBoxColour(ResidueShaderI shader, SequenceI seq, int i)
{
- if (shader != null)
+ if (shader.getColourScheme() != null)
{
resBoxColour = shader.findColour(seq.getCharAt(i), i, seq);
}
{
resBoxColour = shader.findColour(seq.getCharAt(i), i, seq);
}