Changeset 2996 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.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/TagConflictResolverModel.java (modified) (1 diff)

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;