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

Last change on this file since 6397 was 5816, checked in by stoecker, 11 years ago

javadoc fixes

  • Property svn:eol-style set to native
File size: 3.0 KB
Line 
1// License: GPL. For details, see LICENSE file.
2package org.openstreetmap.josm.command;
3
4import static org.openstreetmap.josm.tools.I18n.marktr;
5import static org.openstreetmap.josm.tools.I18n.tr;
6
7import java.util.Collection;
8import java.util.List;
9import javax.swing.Icon;
10
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 a the resolution of a tag conflict in an {@link OsmPrimitive}
21 *
22 */
23public class TagConflictResolveCommand extends ConflictResolveCommand {
24 /** the conflict to resolve */
25 private 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 int n = 0;
37 for (TagMergeItem item: mergeItems) {
38 if (!item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) {
39 n++;
40 }
41 }
42 return n;
43 }
44
45 /**
46 * constructor
47 *
48 * @param conflict the conflict data set
49 * @param mergeItems the list of merge decisions, represented as {@link TagMergeItem}s
50 */
51 public TagConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict, List<TagMergeItem> mergeItems) {
52 this.conflict = conflict;
53 this.mergeItems = mergeItems;
54 }
55
56 @Override
57 public String getDescriptionText() {
58 String msg = "";
59 switch(OsmPrimitiveType.from(conflict.getMy())) {
60 case NODE: msg = marktr("Resolve {0} tag conflicts in node {1}"); break;
61 case WAY: msg = marktr("Resolve {0} tag conflicts in way {1}"); break;
62 case RELATION: msg = marktr("Resolve {0} tag conflicts in relation {1}"); break;
63 }
64 return tr(msg,getNumDecidedConflicts(), conflict.getMy().getId());
65 }
66
67 @Override
68 public Icon getDescriptionIcon() {
69 return ImageProvider.get("data", "object");
70 }
71
72 @Override
73 public boolean executeCommand() {
74 // remember the current state of modified primitives, i.e. of
75 // OSM primitive 'my'
76 //
77 super.executeCommand();
78
79 // apply the merge decisions to OSM primitive 'my'
80 //
81 for (TagMergeItem item: mergeItems) {
82 if (! item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) {
83 item.applyToMyPrimitive(conflict.getMy());
84 }
85 }
86 rememberConflict(conflict);
87 return true;
88 }
89
90 @Override
91 public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
92 Collection<OsmPrimitive> added) {
93 modified.add(conflict.getMy());
94 }
95}
Note: See TracBrowser for help on using the repository browser.