Merge remote-tracking branch 'origin/bug/JAL-2722' into portforward/JAL-2675_2102b1to2103

[jalview.git] / src / jalview / gui / Preferences.java

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 3c0faab..6635dbe 100755 (executable)
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -113,16 +113,13 @@ public class Preferences extends GPreferences
 
   public static final String USE_LEGACY_GAP = "USE_LEGACY_GAP";
 
-  private static final int MIN_FONT_SIZE = 1;
-
-  private static final int MAX_FONT_SIZE = 30;
+  public static final String GAP_COLOUR = "GAP_COLOUR";
 
-  private static final Color OVERVIEW_DEFAULT_GAP = Color.lightGray;
+  public static final String HIDDEN_COLOUR = "HIDDEN_COLOUR";
 
-  private static final Color OVERVIEW_DEFAULT_LEGACY_GAP = Color.white;
+  private static final int MIN_FONT_SIZE = 1;
 
-  private static final Color OVERVIEW_DEFAULT_HIDDEN = Color.darkGray
-          .darker();
+  private static final int MAX_FONT_SIZE = 30;
 
   /**
    * Holds name and link separated with | character. Sequence ID must be
@@ -323,15 +320,16 @@ public class Preferences extends GPreferences
      * Set overview panel defaults
      */
     gapColour.setBackground(
-            Cache.getDefaultColour("GAP_COLOUR", OVERVIEW_DEFAULT_GAP));
+            Cache.getDefaultColour(GAP_COLOUR,
+                    jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_GAP));
     hiddenColour.setBackground(
-            Cache.getDefaultColour("HIDDEN_COLOUR",
-                    OVERVIEW_DEFAULT_HIDDEN));
-    useLegacyGap.setSelected(Cache.getDefault("USE_LEGACY_GAP", false));
+            Cache.getDefaultColour(HIDDEN_COLOUR,
+                    jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_HIDDEN));
+    useLegacyGap.setSelected(Cache.getDefault(USE_LEGACY_GAP, false));
     gapLabel.setEnabled(!useLegacyGap.isSelected());
     gapColour.setEnabled(!useLegacyGap.isSelected());
     showHiddenAtStart
-            .setSelected(Cache.getDefault("SHOW_OV_HIDDEN_AT_START", true));
+            .setSelected(Cache.getDefault(SHOW_OV_HIDDEN_AT_START, true));
 
     /*
      * Set Structure tab defaults.
@@ -658,8 +656,8 @@ public class Preferences extends GPreferences
     /*
      * Save Overview settings
      */
-    Cache.setColourProperty("GAP_COLOUR", gapColour.getBackground());
-    Cache.setColourProperty("HIDDEN_COLOUR", hiddenColour.getBackground());
+    Cache.setColourProperty(GAP_COLOUR, gapColour.getBackground());
+    Cache.setColourProperty(HIDDEN_COLOUR, hiddenColour.getBackground());
     Cache.applicationProperties.setProperty(USE_LEGACY_GAP,
             Boolean.toString(useLegacyGap.isSelected()));
     Cache.applicationProperties.setProperty(SHOW_OV_HIDDEN_AT_START,
@@ -1104,11 +1102,13 @@ public class Preferences extends GPreferences
     boolean enabled = useLegacyGap.isSelected();
     if (enabled)
     {
-      gapColour.setBackground(OVERVIEW_DEFAULT_LEGACY_GAP);
+      gapColour.setBackground(
+              jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_LEGACY_GAP);
     }
     else
     {
-      gapColour.setBackground(OVERVIEW_DEFAULT_GAP);
+      gapColour.setBackground(
+              jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_GAP);
     }
     gapColour.setEnabled(!enabled);
     gapLabel.setEnabled(!enabled);
@@ -1120,7 +1120,8 @@ public class Preferences extends GPreferences
     useLegacyGap.setSelected(false);
     useLegacyGaps_actionPerformed(null);
     showHiddenAtStart.setSelected(true);
-    hiddenColour.setBackground(OVERVIEW_DEFAULT_HIDDEN);
+    hiddenColour.setBackground(
+            jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_HIDDEN);
   }
 
   @Override