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

Last change on this file since 11457 was 11318, checked in by Don-vip, 7 years ago

refactor conflict classes

  • Property svn:eol-style set to native
File size: 3.6 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;
8import java.util.Objects;
9
10import javax.swing.Icon;
11
12import org.openstreetmap.josm.Main;
13import org.openstreetmap.josm.data.conflict.Conflict;
14import org.openstreetmap.josm.data.osm.OsmPrimitive;
15import org.openstreetmap.josm.data.osm.Relation;
16import org.openstreetmap.josm.data.osm.RelationMember;
17import org.openstreetmap.josm.gui.layer.OsmDataLayer;
18import org.openstreetmap.josm.tools.ImageProvider;
19
20/**
21 * Represents the resolution of conflicts in the member list of two {@link Relation}s.
22 * @since 1631
23 */
24public class RelationMemberConflictResolverCommand extends ConflictResolveCommand {
25 /** the conflict to resolve */
26 private final Conflict<Relation> conflict;
27 /** the list of merged nodes. This becomes the list of news of my way after the command is executed */
28 private final List<RelationMember> mergedMembers;
29
30 /**
31 * Constructs a new {@code RelationMemberConflictResolverCommand}.
32 * @param conflict the conflict to resolve
33 * @param mergedMembers the list of merged relation members
34 */
35 @SuppressWarnings("unchecked")
36 public RelationMemberConflictResolverCommand(Conflict<? extends OsmPrimitive> conflict, List<RelationMember> mergedMembers) {
37 this.conflict = (Conflict<Relation>) conflict;
38 this.mergedMembers = mergedMembers;
39 }
40
41 @Override
42 public String getDescriptionText() {
43 return tr("Resolve conflicts in member list of relation {0}", conflict.getMy().getId());
44 }
45
46 @Override
47 public Icon getDescriptionIcon() {
48 return ImageProvider.get("data", "object");
49 }
50
51 @Override
52 public boolean executeCommand() {
53 // remember the current state of 'my' way
54 //
55 super.executeCommand();
56
57 // replace the list of members of 'my' relation by the list of merged members
58 //
59 conflict.getMy().setMembers(mergedMembers);
60
61 return true;
62 }
63
64 @Override
65 public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
66 Collection<OsmPrimitive> added) {
67 modified.add(conflict.getMy());
68 }
69
70 @Override
71 public void undoCommand() {
72 OsmDataLayer layer = getLayer();
73 if (!Main.getLayerManager().containsLayer(layer)) {
74 Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
75 this.toString(),
76 layer.toString()
77 ));
78 return;
79 }
80
81 Main.getLayerManager().setActiveLayer(layer);
82 OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
83
84 // restore the former state
85 //
86 super.undoCommand();
87
88 // restore a conflict if necessary
89 //
90 if (!editLayer.getConflicts().hasConflictForMy(conflict.getMy())) {
91 editLayer.getConflicts().add(conflict);
92 }
93 }
94
95 @Override
96 public int hashCode() {
97 return Objects.hash(super.hashCode(), conflict, mergedMembers);
98 }
99
100 @Override
101 public boolean equals(Object obj) {
102 if (this == obj) return true;
103 if (obj == null || getClass() != obj.getClass()) return false;
104 if (!super.equals(obj)) return false;
105 RelationMemberConflictResolverCommand that = (RelationMemberConflictResolverCommand) obj;
106 return Objects.equals(conflict, that.conflict) &&
107 Objects.equals(mergedMembers, that.mergedMembers);
108 }
109}
Note: See TracBrowser for help on using the repository browser.