Changeset 12920 in josm for trunk/src/org/openstreetmap/josm/gui/datatransfer

Timestamp:

2017-10-03T21:31:04+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15387 - IAE occurs when pasting tags into relation editor using "Paste tags from buffer" (regression from #13036)

Location:

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers

Files:

• AbstractTagPaster.java (modified) (2 diffs)
• PrimitiveTagTransferPaster.java (modified) (2 diffs)

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

@@ -14 +14 @@
 import javax.swing.TransferHandler.TransferSupport;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
@@ -48 +49 @@
     public boolean importTagsOn(TransferSupport support, Collection<? extends OsmPrimitive> selection)
             throws UnsupportedFlavorException, IOException {
-        ChangePropertyCommand command = new ChangePropertyCommand(selection, getTags(support));
+        ChangePropertyCommand command = new ChangePropertyCommand(Main.main.getEditDataSet(), selection, getTags(support));
         commitCommands(selection, Collections.singletonList(command));
         return true;

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

@@ -8 +8 @@
 import java.util.Collection;
 import java.util.EnumMap;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -50 +51 @@
         List<Command> commands = new ArrayList<>();
         for (Tag tag : tagPaster.execute()) {
-            ChangePropertyCommand cmd = new ChangePropertyCommand(selection, tag.getKey(), "".equals(tag.getValue()) ? null : tag.getValue());
+            Map<String, String> tags = new HashMap<>(1);
+            tags.put(tag.getKey(), "".equals(tag.getValue()) ? null : tag.getValue());
+            ChangePropertyCommand cmd = new ChangePropertyCommand(Main.main.getEditDataSet(), selection, tags);
             if (cmd.getObjectsNumber() > 0) {
                 commands.add(cmd);