Changeset 10737 in josm for trunk/src/org/openstreetmap/josm/gui/datatransfer/PrimitiveTransferable.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/PrimitiveTransferable.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/datatransfer/PrimitiveTransferable.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.PrimitiveData;
 import org.openstreetmap.josm.gui.datatransfer.data.OsmLayerTransferData;
+import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTagTransferData;
 import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData;
 import org.openstreetmap.josm.gui.datatransfer.data.TagTransferData;
@@ -75 +76 @@
         } else if (PrimitiveTransferData.DATA_FLAVOR.equals(flavor)) {
             return primitives;
+        } else if (PrimitiveTagTransferData.FLAVOR.equals(flavor)) {
+            return new PrimitiveTagTransferData(primitives);
         } else if (TagTransferData.FLAVOR.equals(flavor)) {
             return new TagTransferData(primitives.getDirectlyAdded());