Changeset 17340 in josm
- Timestamp:
- 2020-11-23T20:29:07+01:00 (4 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
r13613 r17340 135 135 */ 136 136 public ConflictResolver() { 137 resolvedCompletely = false;138 137 build(); 139 138 loadIcons(); … … 240 239 setTheir(conflict.getTheir()); 241 240 this.conflict = conflict; 241 this.resolvedCompletely = false; 242 242 propertiesMerger.populate(conflict); 243 243 -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java
r17333 r17340 57 57 if (!isFrozen()) 58 58 throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Cannot build resolution command.")); 59 return new WayNodesConflictResolverCommand(conflict, getMergedEntries());59 return new WayNodesConflictResolverCommand(conflict, new ArrayList<>(getMergedEntries())); 60 60 } 61 61 -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
r16438 r17340 464 464 @Override 465 465 public void decideRemaining(MergeDecisionType decision) { 466 if (!model.isDecided Coord()) {466 if (!model.isDecidedDeletedState()) { 467 467 model.decideDeletedStateConflict(decision); 468 468 } -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
r11330 r17340 4 4 import static org.openstreetmap.josm.tools.I18n.tr; 5 5 6 import java.util.ArrayList; 6 7 import java.util.Map; 7 8 … … 102 103 if (!isFrozen()) 103 104 throw new IllegalArgumentException(tr("Merged members not frozen yet. Cannot build resolution command")); 104 return new RelationMemberConflictResolverCommand(conflict, getMergedEntries());105 return new RelationMemberConflictResolverCommand(conflict, new ArrayList<>(getMergedEntries())); 105 106 } 106 107 } -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java
r16438 r17340 185 185 186 186 public TagConflictResolveCommand buildResolveCommand(Conflict<? extends OsmPrimitive> conflict) { 187 return new TagConflictResolveCommand(conflict, tagMergeItems);187 return new TagConflictResolveCommand(conflict, new ArrayList<>(tagMergeItems)); 188 188 } 189 189 -
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r17273 r17340 518 518 resolver.populate(c); 519 519 resolver.decideRemaining(type); 520 Command cmd = resolver.buildResolveCommand(); 521 cmd.executeCommand(); // execute now, see #6529 522 commands.add(cmd); 520 commands.add(resolver.buildResolveCommand()); 523 521 } 524 522 } 525 523 } 526 UndoRedoHandler.getInstance().add(new ResolveConflictsCommand(name, commands), false);524 UndoRedoHandler.getInstance().add(new SequenceCommand(name, commands)); 527 525 refreshView(); 528 }529 }530 531 private static class ResolveConflictsCommand extends SequenceCommand {532 // just a wrapper for already executed commands533 ResolveConflictsCommand(String name, Collection<Command> sequenz) {534 super(name, sequenz, true);535 setSequenceComplete(true);536 526 } 537 527 }
Note:
See TracChangeset
for help on using the changeset viewer.