Changeset 12517 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.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/DeleteAction.java (modified) (9 diffs)

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

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.HighlightHelper;
-import org.openstreetmap.josm.gui.util.ModifierListener;
+import org.openstreetmap.josm.gui.util.ModifierExListener;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -45 +45 @@
  * @author imi
  */
-public class DeleteAction extends MapMode implements ModifierListener {
+public class DeleteAction extends MapMode implements ModifierExListener {
     // Cache previous mouse event (needed when only the modifier keys are pressed but the mouse isn't moved)
     private MouseEvent oldEvent;
@@ -113 +113 @@
         Main.map.mapView.addMouseMotionListener(this);
         // This is required to update the cursors when ctrl/shift/alt is pressed
-        Main.map.keyDetector.addModifierListener(this);
+        Main.map.keyDetector.addModifierExListener(this);
     }
 
@@ -121 +121 @@
         Main.map.mapView.removeMouseListener(this);
         Main.map.mapView.removeMouseMotionListener(this);
-        Main.map.keyDetector.removeModifierListener(this);
+        Main.map.keyDetector.removeModifierExListener(this);
         removeHighlighting();
     }
@@ -188 +188 @@
      * segments for the given pointer position (via MouseEvent) and modifiers.
      * @param e current mouse event
-     * @param modifiers mouse modifiers, not necessarly taken from the given mouse event
+     * @param modifiers extended mouse modifiers, not necessarly taken from the given mouse event
      */
     private void addHighlighting(MouseEvent e, int modifiers) {
@@ -242 +242 @@
      *
      * @param e current mouse event
-     * @param modifiers mouse modifiers, not necessarly taken from the given mouse event
+     * @param modifiers extended mouse modifiers, not necessarly taken from the given mouse event
      */
     private void updateCursor(MouseEvent e, int modifiers) {
@@ -278 +278 @@
      */
     private void giveUserFeedback(MouseEvent e) {
-        giveUserFeedback(e, e.getModifiers());
+        giveUserFeedback(e, e.getModifiersEx());
     }
 
@@ -359 +359 @@
 
     private DeleteParameters getDeleteParameters(MouseEvent e, int modifiers) {
-        updateKeyModifiers(modifiers);
+        updateKeyModifiersEx(modifiers);
 
         DeleteParameters result = new DeleteParameters();
@@ -419 +419 @@
      */
     @Override
-    public void modifiersChanged(int modifiers) {
+    public void modifiersExChanged(int modifiers) {
         if (oldEvent == null)
             return;