Changeset 2104 in josm for trunk/src/org

Timestamp:

2009-09-12T18:08:26+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3402: Conflict in created_by when merging nodes or ways (created_by now dropped during combine way and merge node)

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.osm.TagCollection;
 import org.openstreetmap.josm.data.osm.Way;
@@ -189 +190 @@
             cmds.addAll(buildTagChangeCommand(targetPrimitive, tc));
         }
+        if (targetPrimitive.get("created_by") != null) {
+            cmds.add(new ChangePropertyCommand(targetPrimitive, "created_by", null));
+        }
 
         if (getRelationMemberConflictResolverModel().getNumDecisions() >0) {