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-2388 Comment typo
[jalview.git]
/
src
/
jalview
/
appletgui
/
SequenceRenderer.java
diff --git
a/src/jalview/appletgui/SequenceRenderer.java
b/src/jalview/appletgui/SequenceRenderer.java
index
4d9d37c
..
86d1f98
100755
(executable)
--- a/
src/jalview/appletgui/SequenceRenderer.java
+++ b/
src/jalview/appletgui/SequenceRenderer.java
@@
-23,7
+23,7
@@
package jalview.appletgui;
import jalview.api.FeatureRenderer;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
import jalview.api.FeatureRenderer;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
-import jalview.schemes.CollectionColourSchemeI;
+import jalview.renderer.ResidueShaderI;
import java.awt.Color;
import java.awt.Font;
import java.awt.Color;
import java.awt.Font;
@@
-83,7
+83,7
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
}
else if (av.getShowBoxes())
{
}
else if (av.getShowBoxes())
{
- getBoxColour(av.getViewportColourScheme(), seq, i);
+ getBoxColour(av.getResidueShading(), seq, i);
}
return resBoxColour;
}
return resBoxColour;
@@
-114,13
+114,11
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
return col;
}
return col;
}
- void getBoxColour(CollectionColourSchemeI collectionColourSchemeI,
- SequenceI seq, int i)
+ void getBoxColour(ResidueShaderI shader, SequenceI seq, int i)
{
{
- if (collectionColourSchemeI != null)
+ if (shader != null)
{
{
- resBoxColour = collectionColourSchemeI.findColour(seq.getCharAt(i),
- i, seq);
+ resBoxColour = shader.findColour(seq.getCharAt(i), i, seq);
}
else if (forOverview
&& !jalview.util.Comparison.isGap(seq.getCharAt(i)))
}
else if (forOverview
&& !jalview.util.Comparison.isGap(seq.getCharAt(i)))
@@
-184,7
+182,7
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
}
else if (av.getShowBoxes())
{
}
else if (av.getShowBoxes())
{
- getBoxColour(av.getViewportColourScheme(), seq, i);
+ getBoxColour(av.getResidueShading(), seq, i);
}
}
}
}
@@
-274,7
+272,7
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
if (av.getColourText())
{
if (av.getColourText())
{
- getBoxColour(av.getViewportColourScheme(), seq, i);
+ getBoxColour(av.getResidueShading(), seq, i);
if (av.getShowBoxes())
{
graphics.setColor(resBoxColour.darker());
if (av.getShowBoxes())
{
graphics.setColor(resBoxColour.darker());