X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=43b521a57232c31a7b05a41a2f787786deb5c34a;hb=656e362ece73c630f032d8bf30322143a297d92e;hp=58737ee56fc904a8f2ec5143b6e9a5e5df097544;hpb=c860648463c56ba9f75e9d239e2f56edea8e31e7;p=jalview.git diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index 58737ee..43b521a 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -36,7 +36,6 @@ import java.awt.Component; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; -import java.awt.FontMetrics; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.GridLayout; @@ -49,9 +48,8 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import javax.swing.AbstractCellEditor; import javax.swing.BorderFactory; @@ -279,7 +277,6 @@ public class GPreferences extends JPanel protected JCheckBox sortByTree = new JCheckBox(); - /* * Web Services tab */ @@ -533,11 +530,8 @@ 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")); - + MessageManager.getString("label.backup_files")); jPanel11.add(jLabel1); jPanel11.add(blcjv); @@ -1070,14 +1064,13 @@ public class GPreferences extends JPanel hiddenColour_actionPerformed(hiddenColour); } }); - + useLegacyGap = new JCheckBox( MessageManager.getString("label.ov_legacy_gap")); useLegacyGap.setFont(LABEL_FONT); useLegacyGap.setHorizontalAlignment(SwingConstants.LEFT); useLegacyGap.setVerticalTextPosition(SwingConstants.TOP); - gapLabel = new JLabel( - MessageManager.getString("label.gap_colour")); + gapLabel = new JLabel(MessageManager.getString("label.gap_colour")); gapLabel.setFont(LABEL_FONT); gapLabel.setHorizontalAlignment(SwingConstants.LEFT); gapLabel.setVerticalTextPosition(SwingConstants.TOP); @@ -1700,8 +1693,8 @@ public class GPreferences extends JPanel private JPanel initBackupsTab() { JPanel backupsTab = new JPanel(); - backupsTab.setBorder(new TitledBorder(MessageManager - .getString("label.backup_files"))); + backupsTab.setBorder(new TitledBorder( + MessageManager.getString("label.backup_files"))); backupsTab.setLayout(new GridBagLayout()); GridBagConstraints gbc = new GridBagConstraints(); @@ -1717,8 +1710,8 @@ public class GPreferences extends JPanel gbc.weightx = 0.5; enableBackupFiles.setFont(LABEL_FONT_BOLD); - enableBackupFiles.setText( - MessageManager.getString("label.enable_backupfiles")); + enableBackupFiles + .setText(MessageManager.getString("label.enable_backupfiles")); enableBackupFiles.addActionListener(new ActionListener() { @Override @@ -1739,8 +1732,8 @@ public class GPreferences extends JPanel gbc.gridx = 1; gbc.weightx = 1.0; gbc.gridheight = 2; - //gbc.anchor = GridBagConstraints.NORTHEAST; - //gbc.fill = GridBagConstraints.HORIZONTAL; + // gbc.anchor = GridBagConstraints.NORTHEAST; + // gbc.fill = GridBagConstraints.HORIZONTAL; backupsTab.add(exampleFilesPanel, gbc); gbc.gridx = 0; @@ -1764,7 +1757,7 @@ public class GPreferences extends JPanel // whole examples panel next row gbc.gridy = 3; backupsTab.add(exampleFilesPanel, gbc); - + // fill empty space gbc.gridy = 4; gbc.weighty = 1.0; @@ -1775,44 +1768,52 @@ public class GPreferences extends JPanel return backupsTab; } - private final IntKeyStringValueEntry[] backupfilesPresetEntries = - { - new IntKeyStringValueEntry(1, MessageManager.getString("label.default")), - new IntKeyStringValueEntry(2, MessageManager.getString("label.single_file")), - new IntKeyStringValueEntry(3, MessageManager.getString("label.keep_everything")), - new IntKeyStringValueEntry(4, MessageManager.getString("label.rolled_backups")), - // ... - // IMPORTANT, keep "Custom" entry with key 0 (even though it appears last) - new IntKeyStringValueEntry(0, MessageManager.getString("label.custom")) - }; + private final IntKeyStringValueEntry[] backupfilesPresetEntries = { + new IntKeyStringValueEntry(1, + MessageManager.getString("label.default")), + new IntKeyStringValueEntry(2, + MessageManager.getString("label.single_file")), + new IntKeyStringValueEntry(3, + MessageManager.getString("label.keep_everything")), + new IntKeyStringValueEntry(4, + MessageManager.getString("label.rolled_backups")), + // ... + // IMPORTANT, keep "Custom" entry with key 0 (even though it appears last) + new IntKeyStringValueEntry(0, + MessageManager.getString("label.custom")) }; private final Map backupfilesPresetEntriesValues = new HashMap() - {{ - put(1, new BackupFilesPresetEntry(".v"+BackupFiles.NUM_PLACEHOLDER, 3, false, false, 4, false)); + { + { + put(1, new BackupFilesPresetEntry(".v" + BackupFiles.NUM_PLACEHOLDER, + 3, false, false, 4, false)); put(2, new BackupFilesPresetEntry("~", 1, false, false, 1, false)); - put(3, new BackupFilesPresetEntry(".v"+BackupFiles.NUM_PLACEHOLDER, 3, false, true, 10, true)); - put(4, new BackupFilesPresetEntry("_bak."+BackupFiles.NUM_PLACEHOLDER, 1, true, false, 9, false)); - }}; + put(3, new BackupFilesPresetEntry(".v" + BackupFiles.NUM_PLACEHOLDER, + 3, false, true, 10, true)); + put(4, new BackupFilesPresetEntry( + "_bak." + BackupFiles.NUM_PLACEHOLDER, 1, true, false, 9, + false)); + } + }; private JPanel initBackupsTabPresetsPanel() { - presetsPanel.setBorder(new TitledBorder( - MessageManager.getString("label.presets"))); + presetsPanel.setBorder( + new TitledBorder(MessageManager.getString("label.presets"))); for (int i = 0; i < backupfilesPresetEntries.length; i++) { - backupfilesPresetsCombo.addItem(backupfilesPresetEntries[i]); + backupfilesPresetsCombo.addItem(backupfilesPresetEntries[i]); } backupfilesPresetsCombo.addActionListener(new ActionListener() - { - @Override - public void actionPerformed(ActionEvent e) - { - backupsTabUpdatePresets(); - } - } - ); + { + @Override + public void actionPerformed(ActionEvent e) + { + backupsTabUpdatePresets(); + } + }); presetsPanel.add(backupfilesPresetsCombo); return presetsPanel; @@ -1820,21 +1821,25 @@ public class GPreferences extends JPanel private void backupsTabUpdatePresets() { - IntKeyStringValueEntry entry = (IntKeyStringValueEntry) backupfilesPresetsCombo.getSelectedItem(); + IntKeyStringValueEntry entry = (IntKeyStringValueEntry) backupfilesPresetsCombo + .getSelectedItem(); int key = entry.getKey(); String value = entry.getValue(); - boolean custom = key==0; + boolean custom = key == 0; if (custom) { - //backupsSetCustomOptions(); - } else + // backupsSetCustomOptions(); + } + else { if (backupfilesPresetEntriesValues.containsKey(key)) { backupsSetOptions(backupfilesPresetEntriesValues.get(key)); - } else { - System.out.println("Preset '"+value+"' not implemented yet"); + } + else + { + System.out.println("Preset '" + value + "' not implemented yet"); } } @@ -1845,23 +1850,24 @@ public class GPreferences extends JPanel protected int getComboIntStringKey(JComboBox c) { IntKeyStringValueEntry e = (IntKeyStringValueEntry) c.getSelectedItem(); - return e!=null?e.getKey():0; + return e != null ? e.getKey() : 0; } - protected void setComboIntStringKey(JComboBox c, int key) + protected void setComboIntStringKey(JComboBox c, + int key) { - for (int i=0; i < c.getItemCount(); i++) + 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) { - IntKeyStringValueEntry e = c.getItemAt(i); - int k = e.getKey(); - String v = e.getValue(); - if (e.getKey() == key) - { - c.setSelectedIndex(i); - break; - } + c.setSelectedIndex(i); + break; } - backupsTabUpdatePresets(); + } + backupsTabUpdatePresets(); } private JPanel initBackupsTabSuffixPanel() @@ -1875,8 +1881,8 @@ public class GPreferences extends JPanel suffixTemplateLabel.setHorizontalAlignment(SwingConstants.LEFT); suffixTemplateLabel.setFont(LABEL_FONT); - final String tooltip = JvSwingUtils.wrapTooltip(true, MessageManager - .getString("label.suffix_template_tooltip")); + final String tooltip = JvSwingUtils.wrapTooltip(true, + MessageManager.getString("label.suffix_template_tooltip")); suffixTemplate.setToolTipText(tooltip); suffixTemplate.addActionListener(new ActionListener() { @@ -1933,8 +1939,7 @@ public class GPreferences extends JPanel }; setIntegerSpinner(suffixDigitsSpinner, defaultmin, defaultmax, 3, c); - suffixReverse.setLabels( - MessageManager.getString("label.reverse_roll"), + suffixReverse.setLabels(MessageManager.getString("label.reverse_roll"), MessageManager.getString("label.increment_index")); suffixReverse.addActionListener(new ActionListener() { @@ -1956,15 +1961,15 @@ public class GPreferences extends JPanel sgbc.weightx = 1.0; sgbc.weighty = 0.0; sgbc.fill = GridBagConstraints.NONE; - suffixPanel.add(suffixTemplateLabel,sgbc); - + suffixPanel.add(suffixTemplateLabel, sgbc); + sgbc.gridx = 1; sgbc.fill = GridBagConstraints.HORIZONTAL; suffixPanel.add(suffixTemplate, sgbc); - + // second row (number of digits spinner) sgbc.gridy = 1; - + sgbc.gridx = 0; sgbc.fill = GridBagConstraints.NONE; suffixPanel.add(suffixDigitsLabel, sgbc); @@ -2088,7 +2093,7 @@ public class GPreferences extends JPanel jp.add(backupfilesConfirmDelete.getTrueButton()); jp.add(backupfilesConfirmDelete.getFalseButton()); keepfilesPanel.add(jp, kgbc); - + return keepfilesPanel; } @@ -2096,17 +2101,18 @@ public class GPreferences extends JPanel { String title = MessageManager.getString("label.example_filenames"); TitledBorder tb = new TitledBorder(title); - //tb.setTitleFont(LABEL_FONT); + // tb.setTitleFont(LABEL_FONT); exampleFilesPanel.setBorder(tb); exampleFilesPanel.setLayout(new GridBagLayout()); - //inordinately difficult to get this titledborder the right size for the title + // inordinately difficult to get this titledborder the right size for the + // title backupfilesExampleLabel.setEditable(false); backupfilesExampleLabel.setPreferredSize(new Dimension(280, 85)); backupfilesExampleLabel.setAlignmentX(LEFT_ALIGNMENT); backupfilesExampleLabel.setAlignmentY(TOP_ALIGNMENT); - + backupfilesExampleLabel.setFont(LABEL_FONT_ITALIC); backupfilesExampleLabel .setBackground(exampleFilesPanel.getBackground()); @@ -2133,13 +2139,15 @@ public class GPreferences extends JPanel String suffix = suffixTemplate.getText(); int digits = 3; - try { + try + { suffixDigitsSpinner.commitEdit(); digits = (Integer) suffixDigitsSpinner.getValue(); digits = digits < 1 ? 1 : digits; } catch (Exception e) { - System.out.println("Failed casting (Integer) suffixTemplateSpinner.getValue()"); + System.out.println( + "Failed casting (Integer) suffixTemplateSpinner.getValue()"); } boolean reverse = suffixReverse.isSelected(); boolean keepAll = backupfilesKeepAll.isSelected(); @@ -2195,7 +2203,7 @@ public class GPreferences extends JPanel String newest = MessageManager.getString("label.braced_newest"); if (newest != null && newest.length() > 0) { - exampleSB.append(" "+newest); + exampleSB.append(" " + newest); } } else if (index == max) @@ -2203,7 +2211,7 @@ public class GPreferences extends JPanel String oldest = MessageManager.getString("label.braced_oldest"); if (oldest != null && oldest.length() > 0) { - exampleSB.append(" "+oldest); + exampleSB.append(" " + oldest); } } } @@ -2248,7 +2256,7 @@ public class GPreferences extends JPanel String oldest = MessageManager.getString("label.braced_oldest"); if (oldest != null && oldest.length() > 0) { - exampleSB.append(" "+oldest); + exampleSB.append(" " + oldest); } } else if (index == max) @@ -2256,7 +2264,7 @@ public class GPreferences extends JPanel String newest = MessageManager.getString("label.braced_newest"); if (newest != null && newest.length() > 0) { - exampleSB.append(" "+newest); + exampleSB.append(" " + newest); } } } @@ -2330,12 +2338,12 @@ public class GPreferences extends JPanel protected void backupsCustomOptionsSetEnabled(boolean enabled) { - backupsOptionsSetEnabled(enabled, false); + backupsOptionsSetEnabled(enabled, false); } protected void backupsOptionsSetEnabled(boolean enabled) { - backupsOptionsSetEnabled(enabled, true); + backupsOptionsSetEnabled(enabled, true); } protected void backupsOptionsSetEnabled(boolean enabled, boolean all) @@ -2343,11 +2351,11 @@ public class GPreferences extends JPanel if (all) { - presetsPanel.setEnabled(enabled); - exampleFilesPanel.setEnabled(enabled); + presetsPanel.setEnabled(enabled); + exampleFilesPanel.setEnabled(enabled); - backupfilesPresetsCombo.setEnabled(enabled); - backupfilesExampleLabel.setEnabled(enabled); + backupfilesPresetsCombo.setEnabled(enabled); + backupfilesExampleLabel.setEnabled(enabled); } suffixPanel.setEnabled(enabled); keepfilesPanel.setEnabled(enabled); @@ -2366,7 +2374,9 @@ public class GPreferences extends JPanel } } - protected void backupsSetOptions(String suffix, int digits, boolean reverse, boolean keepAll, int rollMax, boolean confirmDelete) + protected void backupsSetOptions(String suffix, int digits, + boolean reverse, boolean keepAll, int rollMax, + boolean confirmDelete) { suffixTemplate.setText(suffix); suffixDigitsSpinner.setValue(digits); @@ -2378,7 +2388,8 @@ public class GPreferences extends JPanel protected void backupsSetOptions(BackupFilesPresetEntry p) { - backupsSetOptions(p.suffix, p.digits, p.reverse, p.keepAll, p.rollMax, p.confirmDelete); + backupsSetOptions(p.suffix, p.digits, p.reverse, p.keepAll, p.rollMax, + p.confirmDelete); } protected void autoIdWidth_actionPerformed() @@ -2567,37 +2578,51 @@ public class GPreferences extends JPanel } } -class IntKeyStringValueEntry { +class IntKeyStringValueEntry +{ int k; + String v; + public IntKeyStringValueEntry(int k, String v) { this.k = k; this.v = v; } + @Override public String toString() { return this.getValue(); } + public int getKey() { return k; } + public String getValue() { return v; } } -class BackupFilesPresetEntry { +class BackupFilesPresetEntry +{ String suffix; + int digits; + boolean reverse; + boolean keepAll; + int rollMax; + boolean confirmDelete; - public BackupFilesPresetEntry(String suffix, int digits, boolean reverse, boolean keepAll, int rollMax, boolean confirmDelete) + + public BackupFilesPresetEntry(String suffix, int digits, boolean reverse, + boolean keepAll, int rollMax, boolean confirmDelete) { this.suffix = suffix; this.digits = digits;