1 | // License: GPL. For details, see LICENSE file.
|
---|
2 | package org.openstreetmap.josm.command;
|
---|
3 |
|
---|
4 | import static org.openstreetmap.josm.tools.I18n.tr;
|
---|
5 |
|
---|
6 | import java.util.Collection;
|
---|
7 |
|
---|
8 | import javax.swing.JLabel;
|
---|
9 | import javax.swing.tree.DefaultMutableTreeNode;
|
---|
10 | import javax.swing.tree.MutableTreeNode;
|
---|
11 |
|
---|
12 | import org.openstreetmap.josm.data.conflict.Conflict;
|
---|
13 | import org.openstreetmap.josm.data.osm.OsmPrimitive;
|
---|
14 | import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
|
---|
15 | import org.openstreetmap.josm.gui.layer.OsmDataLayer;
|
---|
16 | import 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 | */
|
---|
22 | public class DeletedStateConflictResolveCommand extends ConflictResolveCommand {
|
---|
23 |
|
---|
24 | /** the conflict to resolve */
|
---|
25 | private Conflict<OsmPrimitive> 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 DeletedStateConflictResolveCommand(OsmPrimitive my, OsmPrimitive their, MergeDecisionType decision) {
|
---|
38 | this.conflict = new Conflict<OsmPrimitive>(my, their);
|
---|
39 | this.decision = decision;
|
---|
40 | }
|
---|
41 |
|
---|
42 |
|
---|
43 | @Override
|
---|
44 | public MutableTreeNode description() {
|
---|
45 | return new DefaultMutableTreeNode(
|
---|
46 | new JLabel(
|
---|
47 | tr("Resolve conflicts in deleted state in {0}",conflict.getMy().getId()),
|
---|
48 | ImageProvider.get("data", "object"),
|
---|
49 | JLabel.HORIZONTAL
|
---|
50 | )
|
---|
51 | );
|
---|
52 | }
|
---|
53 |
|
---|
54 | @Override
|
---|
55 | public boolean executeCommand() {
|
---|
56 | // remember the current state of modified primitives, i.e. of
|
---|
57 | // OSM primitive 'my'
|
---|
58 | //
|
---|
59 | super.executeCommand();
|
---|
60 |
|
---|
61 | OsmDataLayer layer = getLayer();
|
---|
62 |
|
---|
63 | if (decision.equals(MergeDecisionType.KEEP_MINE)) {
|
---|
64 | if (conflict.getMy().isDeleted()) {
|
---|
65 | // because my was involved in a conflict it my still be referred
|
---|
66 | // to from a way or a relation. Fix this now.
|
---|
67 | //
|
---|
68 | layer.data.unlinkReferencesToPrimitive(conflict.getMy());
|
---|
69 | }
|
---|
70 | } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
|
---|
71 | if (conflict.getTheir().isDeleted()) {
|
---|
72 | layer.data.unlinkReferencesToPrimitive(conflict.getMy());
|
---|
73 | conflict.getMy().setDeleted(true);
|
---|
74 | } else {
|
---|
75 | conflict.getMy().setDeleted(conflict.getTheir().isDeleted());
|
---|
76 | }
|
---|
77 | } else
|
---|
78 | // should not happen
|
---|
79 | throw new IllegalStateException(tr("Cannot resolve undecided conflict."));
|
---|
80 |
|
---|
81 | rememberConflict(conflict);
|
---|
82 | return true;
|
---|
83 | }
|
---|
84 |
|
---|
85 | @Override
|
---|
86 | public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
|
---|
87 | Collection<OsmPrimitive> added) {
|
---|
88 | modified.add(conflict.getMy());
|
---|
89 | }
|
---|
90 | }
|
---|