source: josm/trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java@ 2667

Last change on this file since 2667 was 2512, checked in by stoecker, 14 years ago

i18n updated, fixed files to reduce problems when applying patches, fix #4017

File size: 2.5 KB
Line 
1// License: GPL. For details, see LICENSE file.
2package org.openstreetmap.josm.command;
3
4import static org.openstreetmap.josm.tools.I18n.tr;
5
6import java.util.Collection;
7
8import javax.swing.JLabel;
9import javax.swing.tree.DefaultMutableTreeNode;
10import javax.swing.tree.MutableTreeNode;
11
12import org.openstreetmap.josm.data.conflict.Conflict;
13import org.openstreetmap.josm.data.osm.Node;
14import org.openstreetmap.josm.data.osm.OsmPrimitive;
15import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
16import org.openstreetmap.josm.tools.ImageProvider;
17
18/**
19 * Represents a the resolution of a conflict between the coordinates of two {@see Node}s
20 *
21 */
22public class CoordinateConflictResolveCommand extends ConflictResolveCommand {
23
24 /** the conflict to resolve */
25 private Conflict<Node> conflict;
26
27 /** the merge decision */
28 private final MergeDecisionType decision;
29
30 /**
31 * constructor
32 *
33 * @param my my node
34 * @param their their node
35 * @param decision the merge decision
36 */
37 public CoordinateConflictResolveCommand(Node my, Node their, MergeDecisionType decision) {
38 this.conflict = new Conflict<Node>(my,their);
39 this.decision = decision;
40 }
41
42 @Override
43 public MutableTreeNode description() {
44 return new DefaultMutableTreeNode(
45 new JLabel(
46 tr("Resolve conflicts in coordinates in {0}",conflict.getMy().getId()),
47 ImageProvider.get("data", "object"),
48 JLabel.HORIZONTAL
49 )
50 );
51 }
52
53 @Override
54 public boolean executeCommand() {
55 // remember the current state of modified primitives, i.e. of
56 // OSM primitive 'my'
57 //
58 super.executeCommand();
59
60 if (decision.equals(MergeDecisionType.KEEP_MINE)) {
61 // do nothing
62 } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
63 Node my = conflict.getMy();
64 Node their = conflict.getTheir();
65 my.setCoor(their.getCoor());
66 } else
67 // should not happen
68 throw new IllegalStateException(tr("Cannot resolve undecided conflict."));
69
70 // remember the layer this command was applied to
71 //
72 rememberConflict(conflict);
73
74 return true;
75 }
76
77 @Override
78 public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
79 Collection<OsmPrimitive> added) {
80 modified.add(conflict.getMy());
81 }
82}
Note: See TracBrowser for help on using the repository browser.