Changeset 16328 in josm

Timestamp:

2020-04-17T21:27:35+02:00 (4 years ago)

Author:

simon04

Message:

AddTagsDialog: use TextTagParser.readTagsByRegexp

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (modified) (5 diffs)
• src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/remotecontrol/AddTagsDialogTest.java (modified) (3 diffs)

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

@@ -11 +11 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -18 +17 @@
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
@@ -38 +36 @@
 import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.TextTagParser;
 
 /**
@@ -293 +292 @@
      * @since 15316
      */
-    public static String[][] parseUrlTagsToKeyValues(String urlSection) {
-        return Arrays.stream(urlSection.split("\\|"))
-                .map(String::trim)
-                .filter(tag -> !tag.isEmpty() && tag.contains("="))
-                .map(tag -> tag.split("\\s*=\\s*", 2))
-                .map(pair -> {
-                    pair[1] = pair.length < 2 ? "" : pair[1];
-                    return pair;
-                })
-                .collect(Collectors.toList()).toArray(new String[][] {});
+    public static Map<String, String> parseUrlTagsToKeyValues(String urlSection) {
+        return TextTagParser.readTagsByRegexp(urlSection, "\\|", "(.*?)=(.*?)", false);
     }
 
@@ -313 +304 @@
      */
     public static void addTags(String[][] keyValue, String sender, Collection<? extends OsmPrimitive> primitives) {
-        if (trustedSenders.contains(sender)) {
-            if (MainApplication.getLayerManager().getEditDataSet() != null) {
-                for (String[] row : keyValue) {
-                    UndoRedoHandler.getInstance().add(new ChangePropertyCommand(primitives, row[0], row[1]));
-                }
-            }
-        } else {
-            new AddTagsDialog(keyValue, sender, primitives).showDialog();
-        }
+        new AddTagsDialog(keyValue, sender, primitives).showDialog();
     }
 }

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

@@ -269 +269 @@
                 DataSet ds = MainApplication.getLayerManager().getEditDataSet();
                 if (ds != null) {
-                    for (String[] key : AddTagsDialog.parseUrlTagsToKeyValues(args.get("changeset_tags"))) {
-                        ds.addChangeSetTag(key[0], key[1]);
-                    }
+                    AddTagsDialog.parseUrlTagsToKeyValues(args.get("changeset_tags")).forEach(ds::addChangeSetTag);
                 }
             });

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/AddTagsDialogTest.java

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 
-import java.util.Arrays;
+import java.util.Map;
 
+import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -12 +16 @@
  */
 public class AddTagsDialogTest {
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
 
     /**
@@ -18 +28 @@
     @Test
     public void testParseUrlTagsToKeyValues() {
-        String[][] strings = AddTagsDialog.parseUrlTagsToKeyValues("wikipedia:de=Residenzschloss Dresden|name:en=Dresden Castle");
-        assertEquals("[[wikipedia:de, Residenzschloss Dresden], [name:en, Dresden Castle]]", Arrays.deepToString(strings));
+        Map<String, String> strings = AddTagsDialog.parseUrlTagsToKeyValues("wikipedia:de=Residenzschloss Dresden|name:en=Dresden Castle");
+        assertEquals(2, strings.size());
+        assertEquals("Residenzschloss Dresden", strings.get("wikipedia:de"));
+        assertEquals("Dresden Castle", strings.get("name:en"));
     }
 }