Changeset 5790 in josm for trunk/src

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/util/GuiHelper.java (modified) (1 diff)
• io/remotecontrol/AddTagsDialog.java (modified) (3 diffs)
• io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java

@@ -47 +47 @@
             }
         }
+    }
+    
+    public static void executeByMainWorkerInEDT(final Runnable task) {
+        Main.worker.submit(new Runnable() {
+            public void run() {
+                runInEDTAndWait(task); 
+            }
+        });
     }
 

trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

@@ -80 +80 @@
             count[i] = 0;
             String key = tags[i][0];
+            String value = tags[i][1];
             Boolean b = Boolean.TRUE;
             for (OsmPrimitive osm : sel) {
-                if (osm.keySet().contains(key)) {
+                if (osm.keySet().contains(key) && !osm.get(key).equals(value)) {
                     b = Boolean.FALSE;
                     count[i]++;
@@ -141 +142 @@
         for (int i=0; i<tm.getRowCount(); i++) {
             String key = (String)tm.getValueAt(i, 1);
+            String value = (String)tm.getValueAt(i, 1);
             count[i] = 0;
             for (OsmPrimitive osm : sel) {
-                if (osm.keySet().contains(key)) {
+                if (osm.keySet().contains(key) && !osm.get(key).equals(value)) {
                     count[i]++;
                     break;
@@ -158 +160 @@
     @Override
     protected void buttonAction(int buttonIndex, ActionEvent evt) {
-        if (buttonIndex != 2) {
+        // if layer all layers were closed, ignore all actions
+        if (Main.main.getCurrentDataSet() != null  && buttonIndex != 2) {
             TableModel tm = propertyTable.getModel();
             for (int i=0; i<tm.getRowCount(); i++) {

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();