Changeset 12526 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-07-27T19:08:53+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11924 - fix last warnings about extended modifiers

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• DeleteAction.java (modified) (2 diffs)
• MapMode.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -142 +142 @@
         }
 
-        updateKeyModifiers(e.getModifiers());
+        updateKeyModifiers(e);
 
         Command c;
@@ -295 +295 @@
         Main.map.mapView.requestFocus();
 
-        Command c = buildDeleteCommands(e, e.getModifiers(), false);
+        Command c = buildDeleteCommands(e, e.getModifiersEx(), false);
         if (c != null) {
             Main.main.undoRedo.add(c);

trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java

@@ -150 +150 @@
     }
 
+    /**
+     * Update internal ctrl, alt, shift mask from given input event.
+     * @param e input event
+     */
     protected void updateKeyModifiers(InputEvent e) {
         updateKeyModifiersEx(e.getModifiersEx());
     }
 
+    /**
+     * Update internal ctrl, alt, shift mask from given mouse event.
+     * @param e mouse event
+     */
     protected void updateKeyModifiers(MouseEvent e) {
         updateKeyModifiersEx(e.getModifiersEx());
+    }
+
+    /**
+     * Update internal ctrl, alt, shift mask from given action event.
+     * @param e action event
+     * @since 12526
+     */
+    protected void updateKeyModifiers(ActionEvent e) {
+        // ActionEvent does not have a getModifiersEx() method like other events :(
+        updateKeyModifiersEx(mapOldModifiers(e.getModifiers()));
     }
 
@@ -181 +199 @@
     }
 
+    /**
+     * Map old (pre jdk 1.4) modifiers to extended modifiers (only for Ctrl, Alt, Shift).
+     * @param modifiers old modifiers
+     * @return extended modifiers
+     */
+    @SuppressWarnings("deprecation")
+    private static int mapOldModifiers(int modifiers) {
+        if ((modifiers & InputEvent.CTRL_MASK) != 0) {
+            modifiers |= InputEvent.CTRL_DOWN_MASK;
+        }
+        if ((modifiers & InputEvent.ALT_MASK) != 0) {
+            modifiers |= InputEvent.ALT_DOWN_MASK;
+        }
+        if ((modifiers & InputEvent.ALT_GRAPH_MASK) != 0) {
+            modifiers |= InputEvent.ALT_GRAPH_DOWN_MASK;
+        }
+        if ((modifiers & InputEvent.SHIFT_MASK) != 0) {
+            modifiers |= InputEvent.SHIFT_DOWN_MASK;
+        }
+
+        return modifiers;
+    }
+
     protected void requestFocusInMapView() {
         if (isEnabled()) {