This commit is contained in:
Denis Molony 2016-03-20 10:23:46 +11:00
parent 3dc2a9e895
commit 48b95db89b

View File

@ -23,11 +23,12 @@ class PreferencesDialog extends JDialog
static final int defaultFontSize = 12; static final int defaultFontSize = 12;
static final String[] monoFonts = new FontTester ().getMonospacedFontList (); static final String[] monoFonts = new FontTester ().getMonospacedFontList ();
private final JComboBox catalogFontList = new JComboBox (monoFonts); private final JComboBox<String> catalogFontList = new JComboBox<String> (monoFonts);
private final JComboBox dataFontList = new JComboBox (monoFonts); private final JComboBox<String> dataFontList = new JComboBox<String> (monoFonts);
private final String[] sizes = { "8", "9", "10", "11", "12", "13", "14", "15", "16" }; private final String[] sizes =
private final JComboBox catalogFontSizes = new JComboBox (sizes); { "8", "9", "10", "11", "12", "13", "14", "15", "16", "18" };
private final JComboBox dataFontSizes = new JComboBox (sizes); private final JComboBox<String> catalogFontSizes = new JComboBox<String> (sizes);
private final JComboBox<String> dataFontSizes = new JComboBox<String> (sizes);
private final Preferences prefs; private final Preferences prefs;
private final JButton apply = new JButton ("Apply"); private final JButton apply = new JButton ("Apply");
@ -174,7 +175,7 @@ class PreferencesDialog extends JDialog
int noModifiers = 0; int noModifiers = 0;
KeyStroke escapeKey = KeyStroke.getKeyStroke (KeyEvent.VK_ESCAPE, noModifiers, false); KeyStroke escapeKey = KeyStroke.getKeyStroke (KeyEvent.VK_ESCAPE, noModifiers, false);
InputMap inputMap = InputMap inputMap =
getRootPane ().getInputMap (JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); getRootPane ().getInputMap (JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
inputMap.put (escapeKey, CANCEL_ACTION_KEY); inputMap.put (escapeKey, CANCEL_ACTION_KEY);
AbstractAction cancelAction = new AbstractAction () AbstractAction cancelAction = new AbstractAction ()
{ {