Changeset 7642 in josm for trunk/src/org


Ignore:
Timestamp:
2014-10-21T21:04:05+02:00 (5 years ago)
Author:
Don-vip
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

    r7610 r7642  
    191191     * Replies true if each {@link MultiValueResolutionDecision} is decided.
    192192     *
    193      * @return true if each {@link MultiValueResolutionDecision} is decided; false
    194      * otherwise
     193     * @return true if each {@link MultiValueResolutionDecision} is decided; false otherwise
    195194     */
    196195    public boolean isResolvedCompletely() {
    197         return numConflicts == 0;
     196        return numConflicts == 0 && keysWithConflicts.isEmpty();
    198197    }
    199198
Note: See TracChangeset for help on using the changeset viewer.