Changes between Initial Version and Version 1 of Ticket #14239


Ignore:
Timestamp:
2017-01-14T17:33:49+01:00 (7 years ago)
Author:
skyper
Comment:

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #14239 – Description

    initial v1  
    11In file [source:trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java RelationMemberConflictResolverModel.java] is a small typo in documentation. See [attachment:RelationMemberConflictResolverModel.java.diff attached file]:
    22
    3 attachment:RelationMemberConflictResolverModel.java.diff
     3{{{
     4#!diff
     5--- org/RelationMemberConflictResolverModel.java        2017-01-14 17:22:11.504276628 +0100
     6+++ new/RelationMemberConflictResolverModel.java        2017-01-14 17:22:49.432274960 +0100
     7@@ -244,7 +244,7 @@
     8                         indices.add(decision.getPos());
     9                     }
     10                     if (roles.size() != 1 || !isCollectionOfConsecutiveNumbers(indices)) {
     11-                        // roles to not patch or not consecutive members in relation, leave undecided
     12+                        // roles do not match or not consecutive members in relation, leave undecided
     13                         continue;
     14                     }
     15                     decisions.get(0).decide(RelationMemberConflictDecisionType.KEEP);
     16}}}