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 'features/JAL-4071_visibleFeaturesCounter' into features/JAL-3417_sdppre...
[jalview.git]
/
src
/
jalview
/
renderer
/
ResidueColourFinder.java
diff --git
a/src/jalview/renderer/ResidueColourFinder.java
b/src/jalview/renderer/ResidueColourFinder.java
index
2da7233
..
21d7241
100644
(file)
--- a/
src/jalview/renderer/ResidueColourFinder.java
+++ b/
src/jalview/renderer/ResidueColourFinder.java
@@
-50,8
+50,8
@@
public class ResidueColourFinder
* @return colour of the residue
*/
public Color getResidueColour(boolean showBoxes, ResidueShaderI shader,
* @return colour of the residue
*/
public Color getResidueColour(boolean showBoxes, ResidueShaderI shader,
- SequenceGroup[] allGroups,
- final SequenceI seq, int position, FeatureColourFinder finder)
+ SequenceGroup[] allGroups, final SequenceI seq, int position,
+ FeatureColourFinder finder)
{
Color col = getResidueBoxColour(showBoxes, shader, allGroups, seq,
position);
{
Color col = getResidueBoxColour(showBoxes, shader, allGroups, seq,
position);
@@
-81,9
+81,8
@@
public class ResidueColourFinder
* @return
*/
protected Color getResidueBoxColour(boolean showBoxes,
* @return
*/
protected Color getResidueBoxColour(boolean showBoxes,
- ResidueShaderI shader,
- SequenceGroup[] allGroups,
- SequenceI seq, int i)
+ ResidueShaderI shader, SequenceGroup[] allGroups, SequenceI seq,
+ int i)
{
SequenceGroup currentSequenceGroup = getCurrentSequenceGroup(allGroups,
i);
{
SequenceGroup currentSequenceGroup = getCurrentSequenceGroup(allGroups,
i);
@@
-99,7
+98,7
@@
public class ResidueColourFinder
{
return getBoxColour(shader, seq, i);
}
{
return getBoxColour(shader, seq, i);
}
-
+
return Color.white;
}
return Color.white;
}