Changeset 10737 in josm for trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/AbstractTagPaster.java

Timestamp:

2016-08-05T20:09:55+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12900 - Conflicts in pasted tags cannot be resolved, cannot be resolved to "none" (patch by michael2402) - gsoc-core

File:

• trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/AbstractTagPaster.java (modified) (4 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.datatransfer.importers;
+
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.datatransfer.DataFlavor;
@@ -6 +8 @@
 import java.io.IOException;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
@@ -12 +16 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.I18n;
 
 /**
@@ -42 +49 @@
             throws UnsupportedFlavorException, IOException {
         ChangePropertyCommand command = new ChangePropertyCommand(selection, getTags(support));
-        Main.main.undoRedo.add(command);
+        commitCommands(selection, Collections.singletonList(command));
         return true;
+    }
+
+    /**
+     * Create and execute SequenceCommand with descriptive title
+     * @param selection selected primitives
+     * @param commands the commands to perform in a sequential command
+     * @since 10737
+     */
+    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());
+            String title2 = trn("to {0} object", "to {0} objects", selection.size(), selection.size());
+            @I18n.QuirkyPluralString
+            final String title = title1 + ' ' + title2;
+            Main.main.undoRedo.add(new SequenceCommand(title, commands));
+        }
     }