Changeset 5668 in josm for trunk/src/org

Timestamp:

2013-01-23T20:07:11+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #8372 - Remote control: robustness in processing of addtags parameter of load_and_zoom handler

File:

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

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

@@ -10 +10 @@
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Future;
 
@@ -207 +208 @@
                         throw new RuntimeException();
                     }
-                    String[][] keyValue = new String[tags.length][2];
-                    for (int i = 0; i < tags.length; i++) {
-                        keyValue[i] = tags[i].split("=");
-
-                        keyValue[i][0] = keyValue[i][0];
-                        keyValue[i][1] = keyValue[i][1];
-                    }
-
-                    new AddTagsDialog(keyValue);
+                    Set<String> tagSet = new HashSet<String>();
+                    for (String tag : tags) {
+                        if (!tag.trim().isEmpty() && tag.contains("=")) {
+                            tagSet.add(tag.trim());
+                        }
+                    }
+                    if (!tagSet.isEmpty()) {
+                        String[][] keyValue = new String[tagSet.size()][2];
+                        int i = 0;
+                        for (String tag : tagSet) {
+                            keyValue[i++] = tag.split("=");
+                        }
+    
+                        new AddTagsDialog(keyValue);
+                    }
                 }
             });