Changeset 7642 in josm for trunk

Timestamp:

2014-10-21T21:04:05+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10156 - combine ways: conflicts not shown when no conflicting values (regression from r6802)

File:

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

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

@@ -191 +191 @@
      * Replies true if each {@link MultiValueResolutionDecision} is decided.
      *
-     * @return true if each {@link MultiValueResolutionDecision} is decided; false
-     * otherwise
+     * @return true if each {@link MultiValueResolutionDecision} is decided; false otherwise
      */
     public boolean isResolvedCompletely() {
-        return numConflicts == 0;
+        return numConflicts == 0 && keysWithConflicts.isEmpty();
     }