Changeset 6557 in josm for trunk/src

Timestamp:

2013-12-28T23:23:40+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #3722 - fix shortcuts for "next photo" and "previous photo" after a tag is set

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• tools/InputMapUtils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -446 +446 @@
         tagTable.getActionMap().put("onTableInsert",addAction);
 
-        // unassign some standard shortcuts for JTable to allow upload / download
+        // unassign some standard shortcuts for JTable to allow upload / download / image browsing
         InputMapUtils.unassignCtrlShiftUpDown(tagTable, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+        InputMapUtils.unassignPageUpDown(tagTable, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
 
         // unassign some standard shortcuts for correct copy-pasting, fix #8508

trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java

@@ -22 +22 @@
     }
     
+    /**
+     * Unassign Ctrl-Shift/Alt-Shift Up/Down from the given component
+     * to allow global JOSM shortcuts to work in this component.
+     * @param cmp The Swing component
+     * @param condition one of the following values:
+     * <ul>
+     * <li>JComponent.FOCUS_INPUTMAP_CREATED
+     * <li>JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT
+     * <li>JComponent.WHEN_IN_FOCUSED_WINDOW
+     * </ul>
+     */
     public static void unassignCtrlShiftUpDown(JComponent cmp, int condition) {
         InputMap inputMap=SwingUtilities.getUIInputMap(cmp, condition);
@@ -29 +40 @@
         inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN,InputEvent.ALT_MASK|InputEvent.SHIFT_MASK));
         SwingUtilities.replaceUIInputMap(cmp,JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT,inputMap);
+    }
+
+    /**
+     * Unassign PageUp/PageDown from the given component
+     * to allow global JOSM shortcuts to work in this component.
+     * @param cmp The Swing component
+     * @param condition one of the following values:
+     * <ul>
+     * <li>JComponent.FOCUS_INPUTMAP_CREATED
+     * <li>JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT
+     * <li>JComponent.WHEN_IN_FOCUSED_WINDOW
+     * </ul>
+     * @since 6557
+     */
+    public static void unassignPageUpDown(JComponent cmp, int condition) {
+        InputMap inputMap = SwingUtilities.getUIInputMap(cmp, condition);
+        inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0));
+        inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0));
+        SwingUtilities.replaceUIInputMap(cmp, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, inputMap);
     }