JAL-2443 push getResidueBoxColour inside getResidueColour

[jalview.git] / src / jalview / appletgui / OverviewPanel.java

diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java
index 122401c..251e1c8 100755 (executable)
--- a/src/jalview/appletgui/OverviewPanel.java
+++ b/src/jalview/appletgui/OverviewPanel.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -21,6 +21,7 @@
 package jalview.appletgui;
 
 import jalview.datamodel.AlignmentI;
+import jalview.renderer.seqfeatures.FeatureColourFinder;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -303,6 +304,8 @@ public class OverviewPanel extends Panel implements Runnable,
             .hasHiddenColumns();
     boolean hiddenRow = false;
     AlignmentI alignment = av.getAlignment();
+
+    FeatureColourFinder finder = new FeatureColourFinder(fr);
     for (row = 0; row <= sequencesHeight; row++)
     {
       if (resizeAgain)
@@ -349,16 +352,11 @@ public class OverviewPanel extends Panel implements Runnable,
 
         if (seq.getLength() > lastcol)
         {
-          color = sr.getResidueBoxColour(seq, lastcol);
-
-          if (av.isShowSequenceFeatures())
-          {
-            color = fr.findFeatureColour(color, seq, lastcol);
-          }
+          color = sr.getResidueColour(seq, lastcol, finder);
         }
         else
         {
-          color = Color.white; // White
+          color = Color.white;
         }
 
         if (hiddenRow