source: josm/trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java@ 2990

Last change on this file since 2990 was 2945, checked in by jttt, 14 years ago

Improvements in conflicts gui

File size: 2.9 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.OsmPrimitive;
14import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
15import org.openstreetmap.josm.gui.layer.OsmDataLayer;
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 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 @Override
43 public MutableTreeNode description() {
44 return new DefaultMutableTreeNode(
45 new JLabel(
46 tr("Resolve conflicts in deleted state 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 OsmDataLayer layer = getLayer();
61
62 if (decision.equals(MergeDecisionType.KEEP_MINE)) {
63 if (conflict.getMy().isDeleted()) {
64 // because my was involved in a conflict it my still be referred
65 // to from a way or a relation. Fix this now.
66 //
67 layer.data.unlinkReferencesToPrimitive(conflict.getMy());
68 }
69 } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
70 if (conflict.getTheir().isDeleted()) {
71 layer.data.unlinkReferencesToPrimitive(conflict.getMy());
72 conflict.getMy().setDeleted(true);
73 } else {
74 conflict.getMy().setDeleted(false);
75 }
76 } else
77 // should not happen
78 throw new IllegalStateException(tr("Cannot resolve undecided conflict."));
79
80 rememberConflict(conflict);
81 return true;
82 }
83
84 @Override
85 public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
86 Collection<OsmPrimitive> added) {
87 modified.add(conflict.getMy());
88 }
89}
Note: See TracBrowser for help on using the repository browser.