Changeset 5790 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/handler

Timestamp:

2013-03-21T14:41:44+01:00 (11 years ago)

Author:

akks

Message:

fix #8426: add_tags in remote control: better changed tags detection,
fix EDT violations and NPE when layer is closed while adding tags
added GuiHelper.executeByMainWorkerInEDT to execute GUI-related tasks sequentially from non-EDT threads

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog;
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
@@ -132 +133 @@
          */
         if (args.containsKey("addtags")) {
-            Main.worker.execute(new Runnable() {
+            GuiHelper.executeByMainWorkerInEDT(new Runnable() {
                 public void run() {
                     DataSet ds = Main.main.getCurrentDataSet();
@@ -145 +146 @@
         if (args.containsKey("select") && PermissionPrefWithDefault.CHANGE_SELECTION.isAllowed()) {
             // select objects after downloading, zoom to selection.
-            Main.worker.execute(new Runnable() {
+            GuiHelper.executeByMainWorkerInEDT(new Runnable() {
                 public void run() {
                     HashSet<OsmPrimitive> newSel = new HashSet<OsmPrimitive>();
@@ -199 +200 @@
     static void addTags(final Map<String, String> args) {
         if (args.containsKey("addtags")) {
-            Main.worker.execute(new Runnable() {
+            GuiHelper.executeByMainWorkerInEDT(new Runnable() {
 
                 public void run() {
@@ -235 +236 @@
         // make sure this isn't called unless there *is* a MapView
         if (Main.isDisplayingMapView()) {
-            Main.worker.execute(new Runnable() {
+            GuiHelper.executeByMainWorkerInEDT(new Runnable() {
                 public void run() {
                     BoundingXYVisitor bbox = new BoundingXYVisitor();