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

Timestamp:

2019-05-05T21:04:04+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #17682 - run AddNodeAction later in EDT to make sure the KeyEvent triggering it is consumed before the dialog is shown

File:

• trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (modified) (2 diffs)

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

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 import java.util.Collections;
+
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.command.AddCommand;
@@ -43 +45 @@
             return;
 
-        LatLonDialog dialog = new LatLonDialog(MainApplication.getMainFrame(), tr("Add Node..."), ht("/Action/AddNode"));
+        // #17682 - Run the action later in EDT to make sure the KeyEvent triggering it is consumed before the dialog is shown
+        SwingUtilities.invokeLater(() -> {
+            LatLonDialog dialog = new LatLonDialog(MainApplication.getMainFrame(), tr("Add Node..."), ht("/Action/AddNode"));
 
-        if (textLatLon != null) {
-            dialog.setLatLonText(textLatLon);
-        }
-        if (textEastNorth != null) {
-            dialog.setEastNorthText(textEastNorth);
-        }
+            if (textLatLon != null) {
+                dialog.setLatLonText(textLatLon);
+            }
+            if (textEastNorth != null) {
+                dialog.setEastNorthText(textEastNorth);
+            }
 
-        dialog.showDialog();
+            dialog.showDialog();
 
-        if (dialog.getValue() != 1)
-            return;
+            if (dialog.getValue() != 1)
+                return;
 
-        LatLon coordinates = dialog.getCoordinates();
-        if (coordinates == null)
-            return;
+            LatLon coordinates = dialog.getCoordinates();
+            if (coordinates == null)
+                return;
 
-        textLatLon = dialog.getLatLonText();
-        textEastNorth = dialog.getEastNorthText();
+            textLatLon = dialog.getLatLonText();
+            textEastNorth = dialog.getEastNorthText();
 
-        Node nnew = new Node(coordinates);
+            Node nnew = new Node(coordinates);
 
-        // add the node
-        DataSet ds = getLayerManager().getEditDataSet();
-        UndoRedoHandler.getInstance().add(new AddCommand(ds, nnew));
-        ds.setSelected(nnew);
-        MapView mapView = MainApplication.getMap().mapView;
-        if (mapView != null && !mapView.getRealBounds().contains(nnew.getCoor())) {
-            AutoScaleAction.zoomTo(Collections.<OsmPrimitive>singleton(nnew));
-        }
+            // add the node
+            DataSet ds = getLayerManager().getEditDataSet();
+            UndoRedoHandler.getInstance().add(new AddCommand(ds, nnew));
+            ds.setSelected(nnew);
+            MapView mapView = MainApplication.getMap().mapView;
+            if (mapView != null && !mapView.getRealBounds().contains(nnew.getCoor())) {
+                AutoScaleAction.zoomTo(Collections.<OsmPrimitive>singleton(nnew));
+            }
+        });
     }