Changeset 7015 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

Timestamp:

2014-04-27T17:34:22+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8465 - fix generics for JComboBox/JList

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -97 +97 @@
     private JCheckBox cbDefault = new JCheckBox();
     private JCheckBox cbDisable = new JCheckBox();
-    private JosmComboBox tfKey = new JosmComboBox();
+    private JosmComboBox<String> tfKey = new JosmComboBox<>();
 
     JTable shortcutTable = new JTable();
@@ -218 +218 @@
         cbAlt.setText(ALT); // see above for why no tr()
         tfKey.setAction(action);
-        tfKey.setModel(new DefaultComboBoxModel(keyList.values().toArray()));
+        tfKey.setModel(new DefaultComboBoxModel<>(keyList.values().toArray(new String[0])));
         cbMeta.setAction(action);
         cbMeta.setText(META); // see above for why no tr()