JAL-3741 http to https (and jar to jvp for exampleFile defaults!)
[jalview.git] / src / jalview / gui / Preferences.java
index 00b2a38..f51bfbf 100755 (executable)
@@ -24,12 +24,16 @@ import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder;
 import jalview.bin.Cache;
 import jalview.gui.Help.HelpId;
 import jalview.gui.StructureViewer.ViewerType;
+import jalview.io.BackupFiles;
+import jalview.io.BackupFilesPresetEntry;
 import jalview.io.FileFormatI;
 import jalview.io.JalviewFileChooser;
 import jalview.io.JalviewFileView;
 import jalview.jbgui.GPreferences;
 import jalview.jbgui.GSequenceLink;
-import jalview.schemes.ColourSchemeProperty;
+import jalview.schemes.ColourSchemeI;
+import jalview.schemes.ColourSchemes;
+import jalview.schemes.ResidueColourScheme;
 import jalview.urls.UrlLinkTableModel;
 import jalview.urls.api.UrlProviderFactoryI;
 import jalview.urls.api.UrlProviderI;
@@ -105,6 +109,16 @@ 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";
+
+  public static final String GAP_COLOUR = "GAP_COLOUR";
+
+  public static final String HIDDEN_COLOUR = "HIDDEN_COLOUR";
+
   private static final int MIN_FONT_SIZE = 1;
 
   private static final int MAX_FONT_SIZE = 30;
@@ -151,13 +165,11 @@ public class Preferences extends GPreferences
      * .properties file as '|' separated strings
      */
 
-    groupURLLinks = new ArrayList<String>();
+    groupURLLinks = new ArrayList<>();
   }
 
   JInternalFrame frame;
 
-  DasSourceBrowser dasSource;
-
   private WsPreferences wsPrefs;
 
   private OptionsParam promptEachTimeOpt = new OptionsParam(
@@ -178,8 +190,6 @@ public class Preferences extends GPreferences
     super();
     frame = new JInternalFrame();
     frame.setContentPane(this);
-    dasSource = new DasSourceBrowser();
-    dasTab.add(dasSource, BorderLayout.CENTER);
     wsPrefs = new WsPreferences();
     wsTab.add(wsPrefs, BorderLayout.CENTER);
     int width = 500, height = 450;
@@ -208,18 +218,19 @@ public class Preferences extends GPreferences
     openoverv.setSelected(Cache.getDefault("SHOW_OVERVIEW", false));
     showUnconserved
             .setSelected(Cache.getDefault("SHOW_UNCONSERVED", false));
-    showGroupConsensus.setSelected(Cache.getDefault("SHOW_GROUP_CONSENSUS",
-            false));
-    showGroupConservation.setSelected(Cache.getDefault(
-            "SHOW_GROUP_CONSERVATION", false));
-    showConsensHistogram.setSelected(Cache.getDefault(
-            "SHOW_CONSENSUS_HISTOGRAM", true));
-    showConsensLogo.setSelected(Cache.getDefault("SHOW_CONSENSUS_LOGO",
-            false));
-    showNpTooltip.setSelected(Cache
-            .getDefault("SHOW_NPFEATS_TOOLTIP", true));
-    showDbRefTooltip.setSelected(Cache.getDefault("SHOW_DBREFS_TOOLTIP",
-            true));
+    showOccupancy.setSelected(Cache.getDefault(SHOW_OCCUPANCY, false));
+    showGroupConsensus
+            .setSelected(Cache.getDefault("SHOW_GROUP_CONSENSUS", false));
+    showGroupConservation.setSelected(
+            Cache.getDefault("SHOW_GROUP_CONSERVATION", false));
+    showConsensHistogram.setSelected(
+            Cache.getDefault("SHOW_CONSENSUS_HISTOGRAM", true));
+    showConsensLogo
+            .setSelected(Cache.getDefault("SHOW_CONSENSUS_LOGO", false));
+    showNpTooltip
+            .setSelected(Cache.getDefault("SHOW_NPFEATS_TOOLTIP", true));
+    showDbRefTooltip
+            .setSelected(Cache.getDefault("SHOW_DBREFS_TOOLTIP", true));
 
     String[] fonts = java.awt.GraphicsEnvironment
             .getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
@@ -239,12 +250,12 @@ public class Preferences extends GPreferences
 
     fontNameCB.setSelectedItem(Cache.getDefault("FONT_NAME", "SansSerif"));
     fontSizeCB.setSelectedItem(Cache.getDefault("FONT_SIZE", "10"));
-    fontStyleCB.setSelectedItem(Cache.getDefault("FONT_STYLE", Font.PLAIN
-            + ""));
+    fontStyleCB.setSelectedItem(
+            Cache.getDefault("FONT_STYLE", Font.PLAIN + ""));
 
-    smoothFont.setSelected(Cache.getDefault("ANTI_ALIAS", false));
-    scaleProteinToCdna.setSelected(Cache.getDefault(SCALE_PROTEIN_TO_CDNA,
-            false));
+    smoothFont.setSelected(Cache.getDefault("ANTI_ALIAS", true));
+    scaleProteinToCdna
+            .setSelected(Cache.getDefault(SCALE_PROTEIN_TO_CDNA, false));
 
     idItalics.setSelected(Cache.getDefault("ID_ITALICS", true));
 
@@ -278,26 +289,45 @@ public class Preferences extends GPreferences
     startupCheckbox
             .setSelected(Cache.getDefault("SHOW_STARTUP_FILE", true));
     startupFileTextfield.setText(Cache.getDefault("STARTUP_FILE",
-            Cache.getDefault("www.jalview.org", "http://www.jalview.org")
-                    + "/examples/exampleFile_2_3.jar"));
+            Cache.getDefault("www.jalview.org", "https://www.jalview.org")
+                    + "/examples/exampleFile_2_7.jvp"));
 
     /*
      * Set Colours tab defaults
      */
-    for (int i = ColourSchemeProperty.FIRST_COLOUR; i <= ColourSchemeProperty.LAST_COLOUR; i++)
+    protColour.addItem(ResidueColourScheme.NONE);
+    nucColour.addItem(ResidueColourScheme.NONE);
+    for (ColourSchemeI cs : ColourSchemes.getInstance().getColourSchemes())
     {
-      protColour.addItem(ColourSchemeProperty.getColourName(i));
-      nucColour.addItem(ColourSchemeProperty.getColourName(i));
+      String name = cs.getSchemeName();
+      protColour.addItem(name);
+      nucColour.addItem(name);
     }
-    String oldProp = Cache.getDefault(DEFAULT_COLOUR, "None");
+    String oldProp = Cache.getDefault(DEFAULT_COLOUR,
+            ResidueColourScheme.NONE);
     String newProp = Cache.getDefault(DEFAULT_COLOUR_PROT, null);
     protColour.setSelectedItem(newProp != null ? newProp : oldProp);
     newProp = Cache.getDefault(DEFAULT_COLOUR_NUC, null);
     nucColour.setSelectedItem(newProp != null ? newProp : oldProp);
-    minColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MIN",
-            Color.orange));
-    maxColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MAX",
-            Color.red));
+    minColour.setBackground(
+            Cache.getDefaultColour("ANNOTATIONCOLOUR_MIN", Color.orange));
+    maxColour.setBackground(
+            Cache.getDefaultColour("ANNOTATIONCOLOUR_MAX", Color.red));
+
+    /*
+     * Set overview panel defaults
+     */
+    gapColour.setBackground(
+            Cache.getDefaultColour(GAP_COLOUR,
+                    jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_GAP));
+    hiddenColour.setBackground(
+            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, false));
 
     /*
      * Set Structure tab defaults.
@@ -310,8 +340,8 @@ public class Preferences extends GPreferences
     addSecondaryStructure.setEnabled(structSelected);
     addTempFactor.setSelected(Cache.getDefault(ADD_TEMPFACT_ANN, false));
     addTempFactor.setEnabled(structSelected);
-    structViewer.setSelectedItem(Cache.getDefault(STRUCTURE_DISPLAY,
-            ViewerType.JMOL.name()));
+    structViewer.setSelectedItem(
+            Cache.getDefault(STRUCTURE_DISPLAY, ViewerType.JMOL.name()));
     chimeraPath.setText(Cache.getDefault(CHIMERA_PATH, ""));
     chimeraPath.addActionListener(new ActionListener()
     {
@@ -346,16 +376,16 @@ public class Preferences extends GPreferences
     List<RowSorter.SortKey> sortKeys = new ArrayList<>();
 
     UrlLinkTableModel m = (UrlLinkTableModel) linkUrlTable.getModel();
-    sortKeys.add(new RowSorter.SortKey(m.getDefaultColumn(),
+    sortKeys.add(new RowSorter.SortKey(m.getPrimaryColumn(),
             SortOrder.DESCENDING));
     sortKeys.add(new RowSorter.SortKey(m.getSelectedColumn(),
             SortOrder.DESCENDING));
-    sortKeys.add(new RowSorter.SortKey(m.getNameColumn(),
-            SortOrder.ASCENDING));
+    sortKeys.add(
+            new RowSorter.SortKey(m.getNameColumn(), SortOrder.ASCENDING));
 
     sorter.setSortKeys(sortKeys);
     sorter.sort();
-    
+
     // set up filtering
     ActionListener onReset;
     onReset = new ActionListener()
@@ -404,35 +434,35 @@ public class Preferences extends GPreferences
       @Override
       public void changedUpdate(DocumentEvent e)
       {
-        sorter.setRowFilter(RowFilter.regexFilter(caseInsensitiveFlag
-                + filterTB.getText()));
+        sorter.setRowFilter(RowFilter
+                .regexFilter(caseInsensitiveFlag + filterTB.getText()));
       }
 
       @Override
       public void removeUpdate(DocumentEvent e)
       {
-        sorter.setRowFilter(RowFilter.regexFilter(caseInsensitiveFlag
-                + filterTB.getText()));
+        sorter.setRowFilter(RowFilter
+                .regexFilter(caseInsensitiveFlag + filterTB.getText()));
       }
 
       @Override
       public void insertUpdate(DocumentEvent e)
       {
-        sorter.setRowFilter(RowFilter.regexFilter(caseInsensitiveFlag
-                + filterTB.getText()));
+        sorter.setRowFilter(RowFilter
+                .regexFilter(caseInsensitiveFlag + filterTB.getText()));
       }
     });
 
     // set up list selection functionality
-    linkUrlTable.getSelectionModel().addListSelectionListener(
-            new UrlListSelectionHandler());
+    linkUrlTable.getSelectionModel()
+            .addListSelectionListener(new UrlListSelectionHandler());
 
     // set up radio buttons
     int onClickCol = ((UrlLinkTableModel) linkUrlTable.getModel())
-            .getDefaultColumn();
+            .getPrimaryColumn();
     String onClickName = linkUrlTable.getColumnName(onClickCol);
-    linkUrlTable.getColumn(onClickName).setCellRenderer(
-               new RadioButtonRenderer());
+    linkUrlTable.getColumn(onClickName)
+            .setCellRenderer(new RadioButtonRenderer());
     linkUrlTable.getColumn(onClickName)
             .setCellEditor(new RadioButtonEditor());
 
@@ -442,8 +472,8 @@ public class Preferences extends GPreferences
       if (linkUrlTable.getModel().getColumnClass(column)
               .equals(Boolean.class))
       {
-        TableColumn tableColumn = linkUrlTable.getColumnModel().getColumn(
-                column);
+        TableColumn tableColumn = linkUrlTable.getColumnModel()
+                .getColumn(column);
         int preferredWidth = tableColumn.getMinWidth();
 
         TableCellRenderer cellRenderer = linkUrlTable.getCellRenderer(0,
@@ -459,8 +489,6 @@ public class Preferences extends GPreferences
 
     useProxy.setSelected(Cache.getDefault("USE_PROXY", false));
     useProxy_actionPerformed(); // make sure useProxy is correctly initialised
-    proxyServerTB.setEnabled(useProxy.isSelected());
-    proxyPortTB.setEnabled(useProxy.isSelected());
     proxyServerTB.setText(Cache.getDefault("PROXY_SERVER", ""));
     proxyPortTB.setText(Cache.getDefault("PROXY_PORT", ""));
 
@@ -495,8 +523,10 @@ public class Preferences extends GPreferences
     autoIdWidth.setSelected(Cache.getDefault("FIGURE_AUTOIDWIDTH", false));
     userIdWidth.setEnabled(!autoIdWidth.isSelected());
     userIdWidthlabel.setEnabled(!autoIdWidth.isSelected());
-    Integer wi = Cache.getIntegerProperty("FIGURE_USERIDWIDTH");
+    Integer wi = Cache.getIntegerProperty("FIGURE_FIXEDIDWIDTH");
     userIdWidth.setText(wi == null ? "" : wi.toString());
+    // TODO: refactor to use common enum via FormatAdapter and allow extension
+    // for new flat file formats
     blcjv.setSelected(Cache.getDefault("BLC_JVSUFFIX", true));
     clustaljv.setSelected(Cache.getDefault("CLUSTAL_JVSUFFIX", true));
     fastajv.setSelected(Cache.getDefault("FASTA_JVSUFFIX", true));
@@ -505,19 +535,25 @@ public class Preferences extends GPreferences
     pileupjv.setSelected(Cache.getDefault("PILEUP_JVSUFFIX", true));
     pirjv.setSelected(Cache.getDefault("PIR_JVSUFFIX", true));
     modellerOutput.setSelected(Cache.getDefault("PIR_MODELLER", false));
-    embbedBioJSON.setSelected(Cache.getDefault("EXPORT_EMBBED_BIOJSON",
-            true));
+    embbedBioJSON
+            .setSelected(Cache.getDefault("EXPORT_EMBBED_BIOJSON", true));
 
     /*
      * Set Editing tab defaults
      */
-    autoCalculateConsCheck.setSelected(Cache.getDefault(
-            "AUTO_CALC_CONSENSUS", true));
+    autoCalculateConsCheck
+            .setSelected(Cache.getDefault("AUTO_CALC_CONSENSUS", true));
     padGaps.setSelected(Cache.getDefault("PAD_GAPS", false));
     sortByTree.setSelected(Cache.getDefault("SORT_BY_TREE", false));
 
     annotations_actionPerformed(null); // update the display of the annotation
                                        // settings
+    
+    
+    /*
+     * Set Backups tab defaults
+     */
+    loadLastSavedBackupsOptions();
   }
 
   /**
@@ -554,20 +590,22 @@ public class Preferences extends GPreferences
     Cache.applicationProperties.setProperty("SHOW_IDENTITY",
             Boolean.toString(identity.isSelected()));
 
-    Cache.applicationProperties.setProperty("GAP_SYMBOL", gapSymbolCB
-            .getSelectedItem().toString());
+    Cache.applicationProperties.setProperty("GAP_SYMBOL",
+            gapSymbolCB.getSelectedItem().toString());
 
-    Cache.applicationProperties.setProperty("FONT_NAME", fontNameCB
-            .getSelectedItem().toString());
-    Cache.applicationProperties.setProperty("FONT_STYLE", fontStyleCB
-            .getSelectedItem().toString());
-    Cache.applicationProperties.setProperty("FONT_SIZE", fontSizeCB
-            .getSelectedItem().toString());
+    Cache.applicationProperties.setProperty("FONT_NAME",
+            fontNameCB.getSelectedItem().toString());
+    Cache.applicationProperties.setProperty("FONT_STYLE",
+            fontStyleCB.getSelectedItem().toString());
+    Cache.applicationProperties.setProperty("FONT_SIZE",
+            fontSizeCB.getSelectedItem().toString());
 
     Cache.applicationProperties.setProperty("ID_ITALICS",
             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",
@@ -593,8 +631,8 @@ public class Preferences extends GPreferences
     Cache.applicationProperties.setProperty("SHOW_STARTUP_FILE",
             Boolean.toString(startupCheckbox.isSelected()));
 
-    Cache.applicationProperties.setProperty("SORT_ALIGNMENT", sortby
-            .getSelectedItem().toString());
+    Cache.applicationProperties.setProperty("SORT_ALIGNMENT",
+            sortby.getSelectedItem().toString());
 
     // convert description of sort order to enum name for save
     SequenceAnnotationOrder annSortOrder = SequenceAnnotationOrder
@@ -606,22 +644,32 @@ public class Preferences extends GPreferences
     }
 
     final boolean showAutocalcFirst = sortAutocalc.getSelectedIndex() == 0;
-    Cache.applicationProperties.setProperty(SHOW_AUTOCALC_ABOVE, Boolean
-            .valueOf(showAutocalcFirst).toString());
+    Cache.applicationProperties.setProperty(SHOW_AUTOCALC_ABOVE,
+            Boolean.valueOf(showAutocalcFirst).toString());
 
     /*
      * Save Colours settings
      */
-    Cache.applicationProperties.setProperty(DEFAULT_COLOUR_PROT, protColour
-            .getSelectedItem().toString());
-    Cache.applicationProperties.setProperty(DEFAULT_COLOUR_NUC, nucColour
-            .getSelectedItem().toString());
+    Cache.applicationProperties.setProperty(DEFAULT_COLOUR_PROT,
+            protColour.getSelectedItem().toString());
+    Cache.applicationProperties.setProperty(DEFAULT_COLOUR_NUC,
+            nucColour.getSelectedItem().toString());
     Cache.setColourProperty("ANNOTATIONCOLOUR_MIN",
             minColour.getBackground());
     Cache.setColourProperty("ANNOTATIONCOLOUR_MAX",
             maxColour.getBackground());
 
     /*
+     * Save Overview settings
+     */
+    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,
+            Boolean.toString(showHiddenAtStart.isSelected()));
+
+    /*
      * Save Structure settings
      */
     Cache.applicationProperties.setProperty(ADD_TEMPFACT_ANN,
@@ -632,8 +680,8 @@ public class Preferences extends GPreferences
             Boolean.toString(useRnaView.isSelected()));
     Cache.applicationProperties.setProperty(STRUCT_FROM_PDB,
             Boolean.toString(structFromPdb.isSelected()));
-    Cache.applicationProperties.setProperty(STRUCTURE_DISPLAY, structViewer
-            .getSelectedItem().toString());
+    Cache.applicationProperties.setProperty(STRUCTURE_DISPLAY,
+            structViewer.getSelectedItem().toString());
     Cache.setOrRemove(CHIMERA_PATH, chimeraPath.getText());
     Cache.applicationProperties.setProperty("MAP_WITH_SIFTS",
             Boolean.toString(siftsMapping.isSelected()));
@@ -676,7 +724,7 @@ public class Preferences extends GPreferences
     }
 
     Cache.applicationProperties.setProperty("DEFAULT_URL",
-            sequenceUrlLinks.getDefaultUrlId());
+            sequenceUrlLinks.getPrimaryUrlId());
 
     Cache.applicationProperties.setProperty("USE_PROXY",
             Boolean.toString(useProxy.isSelected()));
@@ -740,7 +788,7 @@ public class Preferences extends GPreferences
     Cache.applicationProperties.setProperty("FIGURE_AUTOIDWIDTH",
             Boolean.toString(autoIdWidth.isSelected()));
     userIdWidth_actionPerformed();
-    Cache.applicationProperties.setProperty("FIGURE_USERIDWIDTH",
+    Cache.applicationProperties.setProperty("FIGURE_FIXEDIDWIDTH",
             userIdWidth.getText());
 
     /*
@@ -753,8 +801,31 @@ public class Preferences extends GPreferences
     Cache.applicationProperties.setProperty("PAD_GAPS",
             Boolean.toString(padGaps.isSelected()));
 
-    dasSource.saveProperties(Cache.applicationProperties);
     wsPrefs.updateAndRefreshWsMenuConfig(false);
+
+    /*
+     * Save Backups settings
+     */
+    Cache.applicationProperties.setProperty(BackupFiles.ENABLED,
+            Boolean.toString(enableBackupFiles.isSelected()));
+    int preset = getComboIntStringKey(backupfilesPresetsCombo);
+    Cache.applicationProperties.setProperty(BackupFiles.NS + "_PRESET", Integer.toString(preset));
+
+    if (preset == BackupFilesPresetEntry.BACKUPFILESSCHEMECUSTOM)
+    {
+      BackupFilesPresetEntry customBFPE = getBackupfilesCurrentEntry();
+      BackupFilesPresetEntry.backupfilesPresetEntriesValues.put(
+              BackupFilesPresetEntry.BACKUPFILESSCHEMECUSTOM, customBFPE);
+      Cache.applicationProperties
+              .setProperty(BackupFilesPresetEntry.CUSTOMCONFIG,
+                      customBFPE.toString());
+    }
+
+    BackupFilesPresetEntry savedBFPE = BackupFilesPresetEntry.backupfilesPresetEntriesValues
+            .get(preset);
+    Cache.applicationProperties.setProperty(
+            BackupFilesPresetEntry.SAVEDCONFIG, savedBFPE.toString());
+
     Cache.saveProperties();
     Desktop.instance.doConfigureStructurePrefs();
     try
@@ -795,11 +866,11 @@ public class Preferences extends GPreferences
   public void startupFileTextfield_mouseClicked()
   {
     String fileFormat = Cache.getProperty("DEFAULT_FILE_FORMAT");
-    JalviewFileChooser chooser = JalviewFileChooser.forRead(
-            Cache.getProperty("LAST_DIRECTORY"), fileFormat);
+    JalviewFileChooser chooser = JalviewFileChooser
+            .forRead(Cache.getProperty("LAST_DIRECTORY"), fileFormat);
     chooser.setFileView(new JalviewFileView());
-    chooser.setDialogTitle(MessageManager
-            .getString("label.select_startup_file"));
+    chooser.setDialogTitle(
+            MessageManager.getString("label.select_startup_file"));
 
     int value = chooser.showOpenDialog(this);
 
@@ -809,10 +880,10 @@ public class Preferences extends GPreferences
       if (format != null)
       {
         Cache.applicationProperties.setProperty("DEFAULT_FILE_FORMAT",
-                format.toString());
+                format.getName());
       }
-      startupFileTextfield.setText(chooser.getSelectedFile()
-              .getAbsolutePath());
+      startupFileTextfield
+              .setText(chooser.getSelectedFile().getAbsolutePath());
     }
   }
 
@@ -847,6 +918,7 @@ public class Preferences extends GPreferences
     conservation.setEnabled(annotations.isSelected());
     quality.setEnabled(annotations.isSelected());
     identity.setEnabled(annotations.isSelected());
+    showOccupancy.setEnabled(annotations.isSelected());
     showGroupConsensus.setEnabled(annotations.isSelected());
     showGroupConservation.setEnabled(annotations.isSelected());
     showConsensHistogram.setEnabled(annotations.isSelected()
@@ -864,15 +936,16 @@ public class Preferences extends GPreferences
     {
       if (JvOptionPane.showInternalConfirmDialog(Desktop.desktop, link,
               MessageManager.getString("label.new_sequence_url_link"),
-              JvOptionPane.OK_CANCEL_OPTION, -1, null) == JvOptionPane.OK_OPTION)
+              JvOptionPane.OK_CANCEL_OPTION, -1,
+              null) == JvOptionPane.OK_OPTION)
       {
         if (link.checkValid())
         {
           if (((UrlLinkTableModel) linkUrlTable.getModel())
                   .isUniqueName(link.getName()))
           {
-            ((UrlLinkTableModel) linkUrlTable.getModel()).insertRow(
-                    link.getName(), link.getURL());
+            ((UrlLinkTableModel) linkUrlTable.getModel())
+                    .insertRow(link.getName(), link.getURL());
             valid = true;
           }
           else
@@ -902,23 +975,30 @@ public class Preferences extends GPreferences
       return;
     }
 
-    link.setName(linkUrlTable.getValueAt(index, 0).toString());
-    link.setURL(linkUrlTable.getValueAt(index, 1).toString());
+    int nameCol = ((UrlLinkTableModel) linkUrlTable.getModel())
+            .getNameColumn();
+    int urlCol = ((UrlLinkTableModel) linkUrlTable.getModel())
+            .getUrlColumn();
+    String oldName = linkUrlTable.getValueAt(index, nameCol).toString();
+    link.setName(oldName);
+    link.setURL(linkUrlTable.getValueAt(index, urlCol).toString());
 
     boolean valid = false;
     while (!valid)
     {
       if (JvOptionPane.showInternalConfirmDialog(Desktop.desktop, link,
               MessageManager.getString("label.edit_sequence_url_link"),
-              JvOptionPane.OK_CANCEL_OPTION, -1, null) == JvOptionPane.OK_OPTION)
+              JvOptionPane.OK_CANCEL_OPTION, -1,
+              null) == JvOptionPane.OK_OPTION)
       {
         if (link.checkValid())
         {
-          if (((UrlLinkTableModel) linkUrlTable.getModel())
-                  .isUniqueName(link.getName()))
+          if ((oldName.equals(link.getName()))
+                  || (((UrlLinkTableModel) linkUrlTable.getModel())
+                          .isUniqueName(link.getName())))
           {
-            linkUrlTable.setValueAt(link.getName(), index, 0);
-            linkUrlTable.setValueAt(link.getURL(), index, 1);
+            linkUrlTable.setValueAt(link.getName(), index, nameCol);
+            linkUrlTable.setValueAt(link.getURL(), index, urlCol);
             valid = true;
           }
           else
@@ -955,13 +1035,12 @@ public class Preferences extends GPreferences
     ((UrlLinkTableModel) linkUrlTable.getModel()).removeRow(modelIndex);
   }
 
-
   @Override
   public void defaultBrowser_mouseClicked(MouseEvent e)
   {
     JFileChooser chooser = new JFileChooser(".");
-    chooser.setDialogTitle(MessageManager
-            .getString("label.select_default_browser"));
+    chooser.setDialogTitle(
+            MessageManager.getString("label.select_default_browser"));
 
     int value = chooser.showOpenDialog(this);
 
@@ -1018,6 +1097,63 @@ public class Preferences extends GPreferences
   }
 
   @Override
+  public void gapColour_actionPerformed(JPanel gap)
+  {
+    if (!useLegacyGap.isSelected())
+    {
+      Color col = JColorChooser.showDialog(this,
+              MessageManager.getString("label.select_gap_colour"),
+              gapColour.getBackground());
+      if (col != null)
+      {
+        gap.setBackground(col);
+      }
+      gap.repaint();
+    }
+  }
+
+  @Override
+  public void hiddenColour_actionPerformed(JPanel hidden)
+  {
+    Color col = JColorChooser.showDialog(this,
+            MessageManager.getString("label.select_hidden_colour"),
+            hiddenColour.getBackground());
+    if (col != null)
+    {
+      hidden.setBackground(col);
+    }
+    hidden.repaint();
+  }
+
+  @Override
+  protected void useLegacyGaps_actionPerformed(ActionEvent e)
+  {
+    boolean enabled = useLegacyGap.isSelected();
+    if (enabled)
+    {
+      gapColour.setBackground(
+              jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_LEGACY_GAP);
+    }
+    else
+    {
+      gapColour.setBackground(
+              jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_GAP);
+    }
+    gapColour.setEnabled(!enabled);
+    gapLabel.setEnabled(!enabled);
+  }
+
+  @Override
+  protected void resetOvDefaults_actionPerformed(ActionEvent e)
+  {
+    useLegacyGap.setSelected(false);
+    useLegacyGaps_actionPerformed(null);
+    showHiddenAtStart.setSelected(false);
+    hiddenColour.setBackground(
+            jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_HIDDEN);
+  }
+
+  @Override
   protected void userIdWidth_actionPerformed()
   {
     try
@@ -1034,8 +1170,9 @@ public class Preferences extends GPreferences
       }
     } catch (NumberFormatException x)
     {
-      JvOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager
-              .getString("warn.user_defined_width_requirements"),
+      JvOptionPane.showInternalMessageDialog(Desktop.desktop,
+              MessageManager
+                      .getString("warn.user_defined_width_requirements"),
               MessageManager.getString("label.invalid_id_column_width"),
               JvOptionPane.WARNING_MESSAGE);
       userIdWidth.setText("");
@@ -1099,8 +1236,7 @@ public class Preferences extends GPreferences
     if (!found)
     {
       String[] options = { "OK", "Help" };
-      int showHelp = JvOptionPane.showInternalOptionDialog(
-              Desktop.desktop,
+      int showHelp = JvOptionPane.showInternalOptionDialog(Desktop.desktop,
               JvSwingUtils.wrapTooltip(true,
                       MessageManager.getString("label.chimera_missing")),
               "", JvOptionPane.YES_NO_OPTION, JvOptionPane.WARNING_MESSAGE,
@@ -1172,7 +1308,7 @@ public class Preferences extends GPreferences
       return name.hashCode() + code.hashCode();
     }
   }
-  
+
   private class UrlListSelectionHandler implements ListSelectionListener
   {
 
@@ -1212,5 +1348,5 @@ public class Preferences extends GPreferences
         editLink.setEnabled(false);
       }
     }
-}
+  }
 }