source: josm/trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java@ 8444

Last change on this file since 8444 was 8444, checked in by Don-vip, 9 years ago

remove extra whitespaces

  • Property svn:eol-style set to native
File size: 2.8 KB
Line 
1// License: GPL. For details, see LICENSE file.
2package org.openstreetmap.josm.command.conflict;
3
4import static org.openstreetmap.josm.tools.I18n.tr;
5
6import java.util.Collection;
7import java.util.List;
8
9import javax.swing.Icon;
10
11import org.openstreetmap.josm.Main;
12import org.openstreetmap.josm.data.osm.OsmPrimitive;
13import org.openstreetmap.josm.data.osm.Relation;
14import org.openstreetmap.josm.data.osm.RelationMember;
15import org.openstreetmap.josm.gui.layer.OsmDataLayer;
16import org.openstreetmap.josm.tools.ImageProvider;
17
18/**
19 * Represents the resolution of conflicts in the member list of two {@link Relation}s.
20 *
21 */
22public class RelationMemberConflictResolverCommand extends ConflictResolveCommand {
23 /** my relation */
24 private final Relation my;
25 /** their relation */
26 private final Relation their;
27 /** the list of merged nodes. This becomes the list of news of my way after the
28 * command is executed
29 */
30 private final List<RelationMember> mergedMembers;
31
32 /**
33 *
34 * @param my my relation
35 * @param their their relation
36 * @param mergedMembers the list of merged relation members
37 */
38 public RelationMemberConflictResolverCommand(Relation my, Relation their, List<RelationMember> mergedMembers) {
39 this.my = my;
40 this.their = their;
41 this.mergedMembers = mergedMembers;
42 }
43
44 @Override
45 public String getDescriptionText() {
46 return tr("Resolve conflicts in member list of relation {0}", my.getId());
47 }
48
49 @Override
50 public Icon getDescriptionIcon() {
51 return ImageProvider.get("data", "object");
52 }
53
54 @Override
55 public boolean executeCommand() {
56 // remember the current state of 'my' way
57 //
58 super.executeCommand();
59
60 // replace the list of members of 'my' relation by the list of merged members
61 //
62 my.setMembers(mergedMembers);
63
64 return true;
65 }
66
67 @Override
68 public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
69 Collection<OsmPrimitive> added) {
70 modified.add(my);
71 }
72
73 @Override
74 public void undoCommand() {
75 OsmDataLayer layer = getLayer();
76 if (!Main.map.mapView.hasLayer(layer)) {
77 Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
78 this.toString(),
79 layer.toString()
80 ));
81 return;
82 }
83
84 Main.map.mapView.setActiveLayer(layer);
85 OsmDataLayer editLayer = Main.main.getEditLayer();
86
87 // restore the former state
88 //
89 super.undoCommand();
90
91 // restore a conflict if necessary
92 //
93 if (!editLayer.getConflicts().hasConflictForMy(my)) {
94 editLayer.getConflicts().add(my,their);
95 }
96 }
97}
Note: See TracBrowser for help on using the repository browser.