Changeset 9440 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
- Timestamp:
- 2016-01-14T16:42:50+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
r8840 r9440 347 347 relationMemberMerger.unlinkAsListener(); 348 348 } 349 350 public void decideRemaining(MergeDecisionType decision) { 351 propertiesMerger.decideRemaining(decision); 352 tagMerger.decideRemaining(decision); 353 if (my instanceof Way) { 354 nodeListMerger.decideRemaining(decision); 355 } else if (my instanceof Relation) { 356 relationMemberMerger.decideRemaining(decision); 357 } 358 updateResolvedCompletely(); 359 if (!isResolvedCompletely()) { 360 throw new AssertionError(); 361 } 362 } 349 363 }
Note:
See TracChangeset
for help on using the changeset viewer.