JAL-2443 push getResidueBoxColour inside getResidueColour

[jalview.git] / src / jalview / ext / jmol / JmolCommands.java

diff --git a/src/jalview/ext/jmol/JmolCommands.java b/src/jalview/ext/jmol/JmolCommands.java
index a1ff3c5..4212749 100644 (file)
--- a/src/jalview/ext/jmol/JmolCommands.java
+++ b/src/jalview/ext/jmol/JmolCommands.java
@@ -102,13 +102,8 @@ public class JmolCommands
 
               lastPos = pos;
 
-              Color col = sr.getResidueBoxColour(sequence[pdbfnum][s], r);
-
-              if (fr != null)
-              {
-                col = finder
-                        .findFeatureColour(col, sequence[pdbfnum][s], r);
-              }
+              Color col = sr.getResidueColour(sequence[pdbfnum][s], r,
+                      finder);
 
               /*
                * shade hidden regions darker