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

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

see #13036 - deprecate Command() default constructor, fix unit tests and java warnings

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