Changeset 2996 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

Timestamp:

16.02.2010 09:30:28 (2 years ago)

Author:

jttt

Message:

Fix #4406 tags disapear: merging node with ID:0 and tag to existing node without tags

File:

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

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

@@ -222 +222 @@
         List<Command> cmds = new LinkedList<Command>();
 
-        if (getTagConflictResolverModel().getNumDecisions() > 0) {
-            TagCollection tc = getTagConflictResolverModel().getResolution();
-            cmds.addAll(buildTagChangeCommand(targetPrimitive, tc));
+        TagCollection allResolutions = getTagConflictResolverModel().getAllResolutions();
+        if (allResolutions.size() > 0) {
+            cmds.addAll(buildTagChangeCommand(targetPrimitive, allResolutions));
         }
         if (targetPrimitive.get("created_by") != null) {