X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=87cc87b3dab038c031763bc1414a2a61461eb463;hb=961e285f3c6769a3d68152a7784d85f6e814cafb;hp=8c60b3616a64cf7ba9a9613850a3d88d00896807;hpb=2d2b6828b010b374731bb3de3945440977b77a66;p=jalview.git diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index 8c60b36..87cc87b 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -24,7 +24,9 @@ import jalview.bin.Cache; import jalview.fts.core.FTSDataColumnPreferences; import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource; import jalview.fts.service.pdb.PDBFTSRestClient; +import jalview.gui.Desktop; import jalview.gui.JalviewBooleanRadioButtons; +import jalview.gui.JvOptionPane; import jalview.gui.JvSwingUtils; import jalview.gui.StructureViewer.ViewerType; import jalview.io.BackupFilenameParts; @@ -534,9 +536,6 @@ public class GPreferences extends JPanel embbedBioJSON.setText(MessageManager.getString("label.embbed_biojson")); embbedBioJSON.setBounds(new Rectangle(228, 200, 250, 23)); - TitledBorder backupFilesBorder = new TitledBorder( - MessageManager.getString("label.backup_files")); - jPanel11.add(jLabel1); jPanel11.add(blcjv); jPanel11.add(clustaljv); @@ -644,6 +643,7 @@ public class GPreferences extends JPanel linkTab.setLayout(new GridBagLayout()); // Set up table for Url links + linkUrlTable.getTableHeader().setReorderingAllowed(false); linkUrlTable.setFillsViewportHeight(true); linkUrlTable.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS); linkUrlTable.setAutoCreateRowSorter(true); @@ -1716,6 +1716,23 @@ public class GPreferences extends JPanel updateBackupFilesExampleLabel(); } + private boolean warnAboutSuffixReverseChange() + { + boolean savedSuffixReverse = Cache.getDefault(BackupFiles.REVERSE_ORDER, + false); + int savedSuffixDigits = Cache.getDefault(BackupFiles.SUFFIX_DIGITS, 3); + String savedSuffixTemplate = Cache.getDefault(BackupFiles.SUFFIX, + ".bak" + BackupFiles.NUM_PLACEHOLDER); + + boolean nowSuffixReverse = suffixReverse.isSelected(); + int nowSuffixDigits = getSpinnerInt(suffixDigitsSpinner, 3); + String nowSuffixTemplate = suffixTemplate.getText(); + return nowSuffixReverse != savedSuffixReverse + && nowSuffixDigits == savedSuffixDigits + && nowSuffixTemplate != null + && nowSuffixTemplate.equals(savedSuffixTemplate); + } + /** * Initialises the Backups tabbed panel. * @@ -1747,7 +1764,6 @@ public class GPreferences extends JPanel @Override public void actionPerformed(ActionEvent e) { - boolean selected = enableBackupFiles.isSelected(); // enable other options only when the first is checked backupsOptionsSetEnabled(); } @@ -1805,8 +1821,9 @@ public class GPreferences extends JPanel return backupsTab; } - private final int BACKUPFILESSCHEMECUSTOMISE = 0; - private final IntKeyStringValueEntry[] backupfilesPresetEntries = { + protected static final int BACKUPFILESSCHEMECUSTOMISE = 0; + + private static final IntKeyStringValueEntry[] backupfilesPresetEntries = { new IntKeyStringValueEntry(1, MessageManager.getString("label.default")), new IntKeyStringValueEntry(2, @@ -1816,14 +1833,17 @@ public class GPreferences extends JPanel new IntKeyStringValueEntry(4, MessageManager.getString("label.rolled_backups")), // ... - // new IntKeyStringValueEntry(255, - // MessageManager.getString("label.previously_saved_scheme")), // IMPORTANT, keep "Custom" entry with key 0 (even though it appears last) new IntKeyStringValueEntry(BACKUPFILESSCHEMECUSTOMISE, MessageManager.getString("label.customise")) }; - private final Map backupfilesPresetEntriesValues = new HashMap() + private static final Map backupfilesPresetEntriesValues = new HashMap() { + /** + * + */ + private static final long serialVersionUID = 125L; + { put(1, new BackupFilesPresetEntry( ".bak" + BackupFiles.NUM_PLACEHOLDER, 3, false, false, 3, @@ -1953,7 +1973,7 @@ public class GPreferences extends JPanel updateBackupFilesExampleLabel(); } - protected int getComboIntStringKey(JComboBox c) + protected int getComboIntStringKey(JComboBox c) { IntKeyStringValueEntry e = (IntKeyStringValueEntry) c.getSelectedItem(); return e != null ? e.getKey() : 0; @@ -1965,8 +1985,6 @@ public class GPreferences extends JPanel for (int i = 0; i < c.getItemCount(); i++) { IntKeyStringValueEntry e = c.getItemAt(i); - int k = e.getKey(); - String v = e.getValue(); if (e.getKey() == key) { c.setSelectedIndex(i); @@ -2054,7 +2072,22 @@ public class GPreferences extends JPanel @Override public void actionPerformed(ActionEvent e) { - updateBackupFilesExampleLabel(); + boolean okay = true; + if (warnAboutSuffixReverseChange()) + { + // Warning popup + okay = confirmSuffixReverseChange(); + } + if (okay) + { + updateBackupFilesExampleLabel(); + } + else + { + boolean savedSuffixReverse = Cache + .getDefault(BackupFiles.REVERSE_ORDER, false); + suffixReverse.setSelected(savedSuffixReverse); + } } }); @@ -2099,6 +2132,20 @@ public class GPreferences extends JPanel return suffixPanel; } + private boolean confirmSuffixReverseChange() + { + boolean ret = false; + String warningMessage = MessageManager + .getString("label.warning_confirm_change_reverse"); + int confirm = JvOptionPane.showConfirmDialog(Desktop.desktop, + warningMessage, + MessageManager.getString("label.change_increment_decrement"), + JvOptionPane.YES_NO_OPTION, JvOptionPane.WARNING_MESSAGE); + + ret = (confirm == JvOptionPane.YES_OPTION); + return ret; + } + private JPanel initBackupsTabKeepFilesPanel() { keepfilesPanel.setBorder( @@ -2122,7 +2169,6 @@ public class GPreferences extends JPanel @Override public void actionPerformed(ActionEvent e) { - boolean selected = backupfilesKeepAll.isSelected(); keepRollMaxOptionsEnabled(); updateBackupFilesExampleLabel(); } @@ -2140,7 +2186,7 @@ public class GPreferences extends JPanel setIntegerSpinner(backupfilesRollMaxSpinner, 1, 999, 4, true, c); backupfilesConfirmDelete.setLabels( - MessageManager.getString("label.confirm_delete"), + MessageManager.getString("label.always_ask"), MessageManager.getString("label.auto_delete")); // update the enabled section keepRollMaxOptionsEnabled(); @@ -2224,32 +2270,16 @@ public class GPreferences extends JPanel return; } - try - { - backupfilesRollMaxSpinner.commitEdit(); - rollMax = (Integer) backupfilesRollMaxSpinner.getValue(); - rollMax = rollMax < 1 ? 1 : rollMax; - } catch (Exception e) - { - System.out.println( - "Failed casting (Integer) backupfilesRollMaxSpinner.getValue()"); - } + rollMax = getSpinnerInt(backupfilesRollMaxSpinner, 4); + rollMax = rollMax < 1 ? 1 : rollMax; if (suffix.indexOf(BackupFiles.NUM_PLACEHOLDER) == -1) { rollMax = 1; } - try - { - suffixDigitsSpinner.commitEdit(); - digits = (Integer) suffixDigitsSpinner.getValue(); - digits = digits < 1 ? 1 : digits; - } catch (Exception e) - { - System.out.println( - "Failed casting (Integer) suffixTemplateSpinner.getValue()"); - } + digits = getSpinnerInt(suffixDigitsSpinner, 3); + digits = digits < 1 ? 1 : digits; int lowersurround = 2; int uppersurround = 0; @@ -2742,18 +2772,20 @@ class BackupFilesPresetEntry class BackupFilesPresetsComboBoxRenderer extends DefaultListCellRenderer { + /** + * + */ + private static final long serialVersionUID = 88L; + @Override - public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { + public Component getListCellRendererComponent(JList list, Object value, + int index, boolean isSelected, boolean cellHasFocus) + { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); try { IntKeyStringValueEntry e = (IntKeyStringValueEntry) value; - if (e.getKey() == 255) - { - // "Previously saved scheme" item - this.setFont(this.getFont().deriveFont(Font.ITALIC)); - } - else if (e.getKey() == 0) + if (e.getKey() == GPreferences.BACKUPFILESSCHEMECUSTOMISE) { // "Customise" item this.setFont(this.getFont().deriveFont(Font.BOLD)); @@ -2764,4 +2796,4 @@ class BackupFilesPresetsComboBoxRenderer extends DefaultListCellRenderer return this; } -} \ No newline at end of file +}