JAL-2136 merged develop into branch to fix build failure

[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..8053ac9 100644 (file)
--- a/src/jalview/ext/jmol/JmolCommands.java
+++ b/src/jalview/ext/jmol/JmolCommands.java
@@ -102,25 +102,18 @@ 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
                */
               if (!cs.isVisible(r))
               {
-                // col = ColorUtils.darkerThan(col);
                 col = Color.GRAY;
               }
 
-              String newSelcom = (mapping[m].getChain() != " " ? ":"
-                      + mapping[m].getChain() : "")
+              String newSelcom = ":" + mapping[m].getChain()
                       + "/"
                       + (pdbfnum + 1)
                       + ".1"