JAL-3485 (enum) constants for Auto-annotation label and preference key

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

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index bc668fd..43fd767 100644 (file)
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -263,8 +263,10 @@ public class AlignViewport extends AlignmentViewport
     {
       if (!alignment.isNucleotide())
       {
-        showConservation = Cache.getDefault("SHOW_CONSERVATION", true);
-        showQuality = Cache.getDefault("SHOW_QUALITY", true);
+        showConservation = Cache.getDefault(
+                AutoAnnotation.CONSERVATION.preferenceKey, true);
+        showQuality = Cache.getDefault(AutoAnnotation.QUALITY.preferenceKey,
+                true);
         showGroupConservation = Cache.getDefault("SHOW_GROUP_CONSERVATION",
                 false);
       }
@@ -274,9 +276,11 @@ public class AlignViewport extends AlignmentViewport
       normaliseSequenceLogo = Cache.getDefault("NORMALISE_CONSENSUS_LOGO",
               false);
       showGroupConsensus = Cache.getDefault("SHOW_GROUP_CONSENSUS", false);
-      showConsensus = Cache.getDefault("SHOW_IDENTITY", true);
+      showConsensus = Cache
+              .getDefault(AutoAnnotation.CONSENSUS.preferenceKey, true);
 
-      showOccupancy = Cache.getDefault(Preferences.SHOW_OCCUPANCY, true);
+      showOccupancy = Cache
+              .getDefault(AutoAnnotation.OCCUPANCY.preferenceKey, true);
     }
     initAutoAnnotation();
     String colourProperty = alignment.isNucleotide()