Changeset 18610 in josm for trunk

Timestamp:

2022-12-07T14:52:06+01:00 (21 months ago)

Author:

taylor.smock

Message:

Fix #21324: Command stack says "pasting 1 tag to [number] objects" regardless of how many tags are pasted

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/datatransfer/importers/AbstractTagPaster.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandlerTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/AbstractTagPaster.java

@@ -62 +62 @@
     protected static void commitCommands(Collection<? extends OsmPrimitive> selection, List<Command> commands) {
         if (!commands.isEmpty()) {
-            String title1 = trn("Pasting {0} tag", "Pasting {0} tags", commands.size(), commands.size());
+            final int changedTags = commands.stream()
+                    .filter(ChangePropertyCommand.class::isInstance)
+                    .map(ChangePropertyCommand.class::cast)
+                    .mapToInt(p -> p.getTags().size())
+                    .sum();
+            String title1 = trn("Pasting {0} tag", "Pasting {0} tags", changedTags, changedTags);
             String title2 = trn("to {0} object", "to {0} objects", selection.size(), selection.size());
             @I18n.QuirkyPluralString

trunk/test/unit/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandlerTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.datatransfer;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collections;
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.openstreetmap.josm.actions.CopyAction;
+import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -15 +24 @@
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -72 +82 @@
         assertEquals("ok", n.get("test"));
     }
+
+    static Stream<Arguments> testNonRegression21324() {
+        return Stream.of(
+                Arguments.of((Runnable) () -> ClipboardUtils.copyString("test=ok\rsomething=else\nnew=line")),
+                Arguments.of((Runnable) () -> {
+                    Node nData = new Node();
+                    nData.put("test", "ok");
+                    nData.put("something", "else");
+                    nData.put("new", "line");
+                    ClipboardUtils.copy(new PrimitiveTransferable(
+                            PrimitiveTransferData.getDataWithReferences(Collections.singletonList(nData)), null));
+                })
+        );
+    }
+
+    /**
+     * Non-regression test for #21324: Command stack says "pasting 1 tag to [number] objects" regardless of how many tags are pasted
+     */
+    @ParameterizedTest
+    @MethodSource
+    void testNonRegression21324(Runnable clipboardCopy) {
+        clipboardCopy.run();
+        Node n = new Node(LatLon.ZERO);
+        MainApplication.getLayerManager().addLayer(new OsmDataLayer(new DataSet(n), "testNonRegression21324", null));
+
+        transferHandler.pasteTags(Collections.singleton(n));
+        Command command = UndoRedoHandler.getInstance().getLastCommand();
+
+        assertAll(() -> assertEquals("ok", n.get("test")),
+                () -> assertEquals("else", n.get("something")),
+                () -> assertEquals("line", n.get("new")),
+                () -> assertEquals(1, UndoRedoHandler.getInstance().getUndoCommands().size()),
+                () -> assertTrue((command instanceof SequenceCommand
+                        && command.getChildren().stream().allMatch(ChangePropertyCommand.class::isInstance))
+                || command instanceof ChangePropertyCommand),
+                () -> assertEquals("Sequence: Pasting 3 tags to 1 object", command.getDescriptionText()));
+    }
 }