Changeset 2996 in josm

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Tag.java (modified) (1 diff)
• data/osm/TagCollection.java (modified) (3 diffs)
• gui/conflict/tags/CombinePrimitiveResolverDialog.java (modified) (1 diff)
• gui/conflict/tags/TagConflictResolverModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/Tag.java

@@ -110 +110 @@
             Tag other = (Tag) obj;
             return key.equals(other.getKey()) && value.equals(other.getValue());
-        } else {
+        } else
             return false;
-        }
     }
 

trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

@@ -117 +117 @@
     }
 
-    private HashSet<Tag> tags;
+    private final HashSet<Tag> tags = new HashSet<Tag>();
 
     /**
@@ -123 +123 @@
      */
     public TagCollection() {
-        tags = new HashSet<Tag>();
     }
 
@@ -133 +132 @@
      */
     public TagCollection(TagCollection other) {
-        this();
         if (other != null) {
             tags.addAll(other.tags);

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) {

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

@@ -182 +182 @@
     }
 
+    //TODO Should this method work with all decisions or only with displayed decisions? For MergeNodes it should be
+    //all decisions, but this method is also used on other places, so I've made new method just for MergeNodes
     public TagCollection getResolution() {
         TagCollection tc = new TagCollection();
         for (String key: displayedKeys) {
             tc.add(decisions.get(key).getResolution());
+        }
+        return tc;
+    }
+
+    public TagCollection getAllResolutions() {
+        TagCollection tc = new TagCollection();
+        for (MultiValueResolutionDecision value: decisions.values()) {
+            tc.add(value.getResolution());
         }
         return tc;