Changeset 11341 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java

Timestamp:

2016-11-28T21:19:04+01:00 (7 years ago)

Author:

simon04

Message:

Search menu items: display shortcut

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.Optional;
 
 import javax.swing.DefaultListCellRenderer;
-import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JMenuItem;
@@ -94 +94 @@
         public Component getListCellRendererComponent(JList<? extends JMenuItem> list, JMenuItem value, int index,
                                                       boolean isSelected, boolean cellHasFocus) {
-            final JLabel label = (JLabel) def.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-            label.setText(value.getText());
-            label.setIcon(value.getIcon());
-            label.setEnabled(value.isEnabled());
             final JMenuItem item = new JMenuItem(value.getText());
             item.setAction(value.getAction());
+            Optional.ofNullable(value.getAction())
+                    .filter(JosmAction.class::isInstance)
+                    .map(JosmAction.class::cast)
+                    .map(JosmAction::getShortcut)
+                    .map(Shortcut::getKeyStroke)
+                    .ifPresent(item::setAccelerator);
             if (isSelected) {
                 item.setBackground(list.getSelectionBackground());