Changeset 12504 in josm

Timestamp:

2017-07-23T23:59:49+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11924 - fix one deprecation warning for InputEvent.ALT_GRAPH_MASK

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DeleteAction.java (modified) (1 diff)
• actions/mapmode/DeleteAction.java (modified) (3 diffs)
• gui/MapFrame.java (modified) (3 diffs)

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

@@ -32 +32 @@
         if (!isEnabled() || !Main.map.mapView.isActiveLayerVisible())
             return;
-        org.openstreetmap.josm.actions.mapmode.DeleteAction.doActionPerformed(e);
+        Main.map.mapModeDelete.doActionPerformed(e);
     }
 

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

@@ -6 +6 @@
 import java.awt.Cursor;
 import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
@@ -136 +135 @@
      * @param e Action event
      */
-    public static void doActionPerformed(ActionEvent e) {
+    public void doActionPerformed(ActionEvent e) {
         MainLayerManager lm = Main.getLayerManager();
         OsmDataLayer editLayer = lm.getEditLayer();
@@ -143 +142 @@
         }
 
-        boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
-        boolean alt = (e.getModifiers() & (ActionEvent.ALT_MASK | InputEvent.ALT_GRAPH_MASK)) != 0;
+        updateKeyModifiers(e.getModifiers());
 
         Command c;

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -173 +173 @@
     /** Zoom mode */
     public final ZoomAction mapModeZoom;
+    /** Delete mode */
+    public final DeleteAction mapModeDelete;
     /** Select Lasso mode */
     public LassoModeAction mapModeSelectLasso;
@@ -239 +241 @@
         mapModeDraw = new DrawAction();
         mapModeZoom = new ZoomAction(this);
+        mapModeDelete = new DeleteAction();
 
         addMapMode(new IconToggleButton(mapModeSelect));
@@ -244 +247 @@
         addMapMode(new IconToggleButton(mapModeDraw));
         addMapMode(new IconToggleButton(mapModeZoom, true));
-        addMapMode(new IconToggleButton(new DeleteAction(), true));
+        addMapMode(new IconToggleButton(mapModeDelete, true));
         addMapMode(new IconToggleButton(new ParallelWayAction(this), true));
         addMapMode(new IconToggleButton(new ExtrudeAction(), true));