Changeset 12517 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

Timestamp:

2017-07-26T23:18:38+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11924 - use extended event modifiers, deprecate old methods - see ​https://bugs.openjdk.java.net/browse/JDK-8143077

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (8 diffs)

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

@@ -49 +49 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.util.KeyPressReleaseListener;
-import org.openstreetmap.josm.gui.util.ModifierListener;
+import org.openstreetmap.josm.gui.util.ModifierExListener;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Pair;
@@ -66 +66 @@
  * feature "selection remove" is disabled on this platform.
  */
-public class SelectAction extends MapMode implements ModifierListener, KeyPressReleaseListener, SelectionEnded {
+public class SelectAction extends MapMode implements ModifierExListener, KeyPressReleaseListener, SelectionEnded {
 
     private static final String NORMAL = "normal";
@@ -208 +208 @@
         virtualManager.init();
         // This is required to update the cursors when ctrl/shift/alt is pressed
-        Main.map.keyDetector.addModifierListener(this);
+        Main.map.keyDetector.addModifierExListener(this);
         Main.map.keyDetector.addKeyListener(this);
     }
@@ -219 +219 @@
         mv.removeMouseMotionListener(this);
         mv.setVirtualNodesEnabled(false);
-        Main.map.keyDetector.removeModifierListener(this);
+        Main.map.keyDetector.removeModifierExListener(this);
         Main.map.keyDetector.removeKeyListener(this);
         removeHighlighting();
@@ -225 +225 @@
 
     @Override
-    public void modifiersChanged(int modifiers) {
+    public void modifiersExChanged(int modifiers) {
         if (!Main.isDisplayingMapView() || oldEvent == null) return;
         if (giveUserFeedback(oldEvent, modifiers)) {
@@ -239 +239 @@
      */
     private boolean giveUserFeedback(MouseEvent e) {
-        return giveUserFeedback(e, e.getModifiers());
+        return giveUserFeedback(e, e.getModifiersEx());
     }
 
@@ -246 +246 @@
      * Please note that the highlighting for merging while moving is handled via mouseDragged.
      * @param e {@code MouseEvent} which should be used as base for the feedback
-     * @param modifiers define custom keyboard modifiers if the ones from MouseEvent are outdated or similar
+     * @param modifiers define custom keyboard extended modifiers if the ones from MouseEvent are outdated or similar
      * @return {@code true} if repaint is required
      */
@@ -253 +253 @@
                 mv.getNearestNodeOrWay(e.getPoint(), mv.isSelectablePredicate, true));
 
-        updateKeyModifiers(modifiers);
+        updateKeyModifiersEx(modifiers);
         determineMapMode(!c.isEmpty());