source: josm/trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java

Last change on this file was 16436, checked in by simon04, 4 years ago

see #19251 - Java 8: use Stream

  • Property svn:eol-style set to native
File size: 4.1 KB
Line 
1// License: GPL. For details, see LICENSE file.
2package org.openstreetmap.josm.command.conflict;
3
4import static org.openstreetmap.josm.tools.I18n.trn;
5
6import java.util.Collection;
7import java.util.List;
8import java.util.Objects;
9
10import javax.swing.Icon;
11
12import org.openstreetmap.josm.data.conflict.Conflict;
13import org.openstreetmap.josm.data.osm.OsmPrimitive;
14import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
15import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
16import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;
17import org.openstreetmap.josm.tools.ImageProvider;
18
19/**
20 * Represents the resolution of a tag conflict in an {@link OsmPrimitive}.
21 *
22 */
23public class TagConflictResolveCommand extends ConflictResolveCommand {
24 /** the conflict to resolve */
25 private final Conflict<? extends OsmPrimitive> conflict;
26
27 /** the list of merge decisions, represented as {@link TagMergeItem}s */
28 private final List<TagMergeItem> mergeItems;
29
30 /**
31 * replies the number of decided conflicts
32 *
33 * @return the number of decided conflicts
34 */
35 public int getNumDecidedConflicts() {
36 return (int) mergeItems.stream().filter(item -> item.getMergeDecision() != MergeDecisionType.UNDECIDED).count();
37 }
38
39 /**
40 * constructor
41 *
42 * @param conflict the conflict data set
43 * @param mergeItems the list of merge decisions, represented as {@link TagMergeItem}s
44 */
45 public TagConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict, List<TagMergeItem> mergeItems) {
46 super(conflict.getMy().getDataSet());
47 this.conflict = conflict;
48 this.mergeItems = mergeItems;
49 }
50
51 @Override
52 public String getDescriptionText() {
53 switch (OsmPrimitiveType.from(conflict.getMy())) {
54 case NODE:
55 /* for correct i18n of plural forms - see #9110 */
56 return trn("Resolve {0} tag conflict in node {1}", "Resolve {0} tag conflicts in node {1}",
57 getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
58 case WAY:
59 /* for correct i18n of plural forms - see #9110 */
60 return trn("Resolve {0} tag conflict in way {1}", "Resolve {0} tag conflicts in way {1}",
61 getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
62 case RELATION:
63 /* for correct i18n of plural forms - see #9110 */
64 return trn("Resolve {0} tag conflict in relation {1}", "Resolve {0} tag conflicts in relation {1}",
65 getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
66 default:
67 return "";
68 }
69 }
70
71 @Override
72 public Icon getDescriptionIcon() {
73 return ImageProvider.get("data", "object");
74 }
75
76 @Override
77 public boolean executeCommand() {
78 // remember the current state of modified primitives, i.e. of
79 // OSM primitive 'my'
80 //
81 super.executeCommand();
82
83 // apply the merge decisions to OSM primitive 'my'
84 //
85 for (TagMergeItem item: mergeItems) {
86 if (item.getMergeDecision() != MergeDecisionType.UNDECIDED) {
87 item.applyToMyPrimitive(conflict.getMy());
88 }
89 }
90 rememberConflict(conflict);
91 return true;
92 }
93
94 @Override
95 public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
96 Collection<OsmPrimitive> added) {
97 modified.add(conflict.getMy());
98 }
99
100 @Override
101 public int hashCode() {
102 return Objects.hash(super.hashCode(), conflict, mergeItems);
103 }
104
105 @Override
106 public boolean equals(Object obj) {
107 if (this == obj) return true;
108 if (obj == null || getClass() != obj.getClass()) return false;
109 if (!super.equals(obj)) return false;
110 TagConflictResolveCommand that = (TagConflictResolveCommand) obj;
111 return Objects.equals(conflict, that.conflict) &&
112 Objects.equals(mergeItems, that.mergeItems);
113 }
114}
Note: See TracBrowser for help on using the repository browser.