JAL-3485 constants for CDNA_CONSENSUS, STRUCTURE_CONSENSUS added

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

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index bee6a73..663390d 100755 (executable)
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -40,6 +40,7 @@ import jalview.urls.desktop.DesktopUrlProviderFactory;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 import jalview.util.UrlConstants;
+import jalview.viewmodel.AlignmentViewport.AutoAnnotation;
 import jalview.ws.sifts.SiftsSettings;
 
 import java.awt.BorderLayout;
@@ -108,8 +109,6 @@ public class Preferences extends GPreferences
 
   public static final String SHOW_AUTOCALC_ABOVE = "SHOW_AUTOCALC_ABOVE";
 
-  public static final String SHOW_OCCUPANCY = "SHOW_OCCUPANCY";
-
   public static final String SHOW_OV_HIDDEN_AT_START = "SHOW_OV_HIDDEN_AT_START";
 
   public static final String USE_LEGACY_GAP = "USE_LEGACY_GAP";
@@ -211,13 +210,17 @@ public class Preferences extends GPreferences
     fullScreen.setSelected(Cache.getDefault("SHOW_FULLSCREEN", false));
     annotations.setSelected(Cache.getDefault("SHOW_ANNOTATIONS", true));
 
-    conservation.setSelected(Cache.getDefault("SHOW_CONSERVATION", true));
-    quality.setSelected(Cache.getDefault("SHOW_QUALITY", true));
-    identity.setSelected(Cache.getDefault("SHOW_IDENTITY", true));
+    conservation.setSelected(Cache
+            .getDefault(AutoAnnotation.CONSERVATION.preferenceKey, true));
+    quality.setSelected(
+            Cache.getDefault(AutoAnnotation.QUALITY.preferenceKey, true));
+    identity.setSelected(
+            Cache.getDefault(AutoAnnotation.CONSENSUS.preferenceKey, true));
     openoverv.setSelected(Cache.getDefault("SHOW_OVERVIEW", false));
     showUnconserved
             .setSelected(Cache.getDefault("SHOW_UNCONSERVED", false));
-    showOccupancy.setSelected(Cache.getDefault(SHOW_OCCUPANCY, false));
+    showOccupancy.setSelected(Cache
+            .getDefault(AutoAnnotation.OCCUPANCY.preferenceKey, false));
     showGroupConsensus
             .setSelected(Cache.getDefault("SHOW_GROUP_CONSENSUS", false));
     showGroupConservation.setSelected(
@@ -326,7 +329,7 @@ public class Preferences extends GPreferences
     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, false));
 
     /*
      * Set Structure tab defaults.
@@ -552,31 +555,7 @@ public class Preferences extends GPreferences
     /*
      * Set Backups tab defaults
      */
-    enableBackupFiles
-            .setSelected(Cache.getDefault(BackupFiles.ENABLED, true));
-    suffixTemplate.setText(Cache.getDefault(BackupFiles.SUFFIX,
-            ".v" + BackupFiles.NUM_PLACEHOLDER));
-    suffixDigitsSpinner
-            .setValue(Cache.getDefault(BackupFiles.SUFFIX_DIGITS, 3));
-    suffixReverse.setSelected(
-            Cache.getDefault(BackupFiles.REVERSE_ORDER, false));
-    backupfilesKeepAll
-            .setSelected(Cache.getDefault(BackupFiles.NO_MAX, false));
-    backupfilesRollMaxSpinner
-            .setValue(Cache.getDefault(BackupFiles.ROLL_MAX, 4));
-    backupfilesConfirmDelete.setSelected(
-            Cache.getDefault(BackupFiles.CONFIRM_DELETE_OLD, true));
-    backupsOptionsSetEnabled(enableBackupFiles.isSelected());
-    updateBackupFilesExampleLabel();
-    /*
-    suffixPanel.setPreferredSize(
-            new Dimension(width, suffixPanel.getHeight()));
-    keepfilesPanel.setPreferredSize(
-            new Dimension(width, keepfilesPanel.getHeight()));
-    exampleFilesPanel.setPreferredSize(
-            new Dimension(width, exampleFilesPanel.getHeight()));
-            */
-
+    loadLastSavedBackupsOptions();
   }
 
   /**
@@ -606,12 +585,18 @@ public class Preferences extends GPreferences
             Boolean.toString(openoverv.isSelected()));
     Cache.applicationProperties.setProperty("SHOW_ANNOTATIONS",
             Boolean.toString(annotations.isSelected()));
-    Cache.applicationProperties.setProperty("SHOW_CONSERVATION",
+    Cache.applicationProperties.setProperty(
+            AutoAnnotation.CONSERVATION.preferenceKey,
             Boolean.toString(conservation.isSelected()));
-    Cache.applicationProperties.setProperty("SHOW_QUALITY",
+    Cache.applicationProperties.setProperty(
+            AutoAnnotation.QUALITY.preferenceKey,
             Boolean.toString(quality.isSelected()));
-    Cache.applicationProperties.setProperty("SHOW_IDENTITY",
+    Cache.applicationProperties.setProperty(
+            AutoAnnotation.CONSENSUS.preferenceKey,
             Boolean.toString(identity.isSelected()));
+    Cache.applicationProperties.setProperty(
+            AutoAnnotation.OCCUPANCY.preferenceKey,
+            Boolean.toString(showOccupancy.isSelected()));
 
     Cache.applicationProperties.setProperty("GAP_SYMBOL",
             gapSymbolCB.getSelectedItem().toString());
@@ -627,8 +612,6 @@ public class Preferences extends GPreferences
             Boolean.toString(idItalics.isSelected()));
     Cache.applicationProperties.setProperty("SHOW_UNCONSERVED",
             Boolean.toString(showUnconserved.isSelected()));
-    Cache.applicationProperties.setProperty(SHOW_OCCUPANCY,
-            Boolean.toString(showOccupancy.isSelected()));
     Cache.applicationProperties.setProperty("SHOW_GROUP_CONSENSUS",
             Boolean.toString(showGroupConsensus.isSelected()));
     Cache.applicationProperties.setProperty("SHOW_GROUP_CONSERVATION",
@@ -843,6 +826,8 @@ public class Preferences extends GPreferences
             Integer.toString(getSpinnerInt(backupfilesRollMaxSpinner, 4)));
     Cache.applicationProperties.setProperty(BackupFiles.SUFFIX_DIGITS,
             Integer.toString(getSpinnerInt(suffixDigitsSpinner, 3)));
+    Cache.applicationProperties.setProperty(BackupFiles.NS+"_PRESET",
+            Integer.toString(getComboIntStringKey(backupfilesPresetsCombo)));
 
     Cache.saveProperties();
     Desktop.instance.doConfigureStructurePrefs();
@@ -1166,7 +1151,7 @@ public class Preferences extends GPreferences
   {
     useLegacyGap.setSelected(false);
     useLegacyGaps_actionPerformed(null);
-    showHiddenAtStart.setSelected(true);
+    showHiddenAtStart.setSelected(false);
     hiddenColour.setBackground(
             jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_HIDDEN);
   }