Changeset 5696 in josm for trunk

Timestamp:

2013-02-06T01:04:27+01:00 (11 years ago)

Author:

Don-vip

Message:

Disable single-char JOSM shortcuts when relation dialog filter textfield has focus (see r5616 comment)

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• gui/dialogs/RelationListDialog.java (modified) (2 diffs)
• gui/widgets/DisableShortcutsOnFocusGainedTextField.java (added)

trunk/src/org/openstreetmap/josm/Main.java

@@ -511 +511 @@
         contentPanePrivate.getActionMap().remove(action);
     }
+    
+    /**
+     * Replies the registered action for the given shortcut
+     * @param shortcut The shortcut to look for
+     * @return the registered action for the given shortcut
+     * @since 5696
+     */
+    public static Action getRegisteredActionShortcut(Shortcut shortcut) {
+        KeyStroke keyStroke = shortcut.getKeyStroke();
+        if (keyStroke == null)
+            return null;
+        Object action = contentPanePrivate.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).get(keyStroke);
+        if (action instanceof Action)
+            return (Action) action;
+        return null;
+    }
 
     ///////////////////////////////////////////////////////////////////////////

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

@@ -74 +74 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField;
 import org.openstreetmap.josm.gui.widgets.ListPopupMenu;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -153 +154 @@
         displaylist.addListSelectionListener(selectAction);
 
-        final JTextField filter = new JTextField();
+        final JTextField filter = new DisableShortcutsOnFocusGainedTextField();
         filter.setToolTipText(tr("Relation list filter"));
         filter.getDocument().addDocumentListener(new DocumentListener() {