JAL-3997 check for tooltip being null before checking equivalence to last tooltip...

[jalview.git] / src / jalview / renderer / OverviewResColourFinder.java

diff --git a/src/jalview/renderer/OverviewResColourFinder.java b/src/jalview/renderer/OverviewResColourFinder.java
index b606ba3..57cae1c 100644 (file)
--- a/src/jalview/renderer/OverviewResColourFinder.java
+++ b/src/jalview/renderer/OverviewResColourFinder.java
@@ -22,7 +22,6 @@ package jalview.renderer;
 
 import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
-import jalview.gui.Preferences;
 import jalview.util.Comparison;
 
 import java.awt.Color;
@@ -37,13 +36,19 @@ public class OverviewResColourFinder extends ResidueColourFinder
 
   boolean useLegacy = false;
 
+  public static final Color OVERVIEW_DEFAULT_GAP = Color.lightGray;
+
+  public static final Color OVERVIEW_DEFAULT_LEGACY_GAP = Color.white;
+
+  public static final Color OVERVIEW_DEFAULT_HIDDEN = Color.darkGray
+          .darker();
+
   /**
    * Constructor without colour settings (used by applet)
    */
   public OverviewResColourFinder()
   {
-    this(false, Preferences.OVERVIEW_DEFAULT_GAP,
-            Preferences.OVERVIEW_DEFAULT_HIDDEN);
+    this(false, OVERVIEW_DEFAULT_GAP, OVERVIEW_DEFAULT_HIDDEN);
   }
 
   /**
@@ -108,8 +113,8 @@ public class OverviewResColourFinder extends ResidueColourFinder
    */
   @Override
   protected Color getResidueBoxColour(boolean showBoxes,
-          ResidueShaderI shader,
-          SequenceGroup[] allGroups, SequenceI seq, int i)
+          ResidueShaderI shader, SequenceGroup[] allGroups, SequenceI seq,
+          int i)
   {
     ResidueShaderI currentShader;
     SequenceGroup currentSequenceGroup = getCurrentSequenceGroup(allGroups,