source: josm/trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java@ 6450

Last change on this file since 6450 was 6248, checked in by Don-vip, 11 years ago

Rework console output:

  • new log level "error"
  • Replace nearly all calls to system.out and system.err to Main.(error|warn|info|debug)
  • Remove some unnecessary debug output
  • Some messages are modified (removal of "Info", "Warning", "Error" from the message itself -> notable i18n impact but limited to console error messages not seen by the majority of users, so that's ok)
  • Property svn:eol-style set to native
File size: 2.3 KB
Line 
1// License: GPL. For details, see LICENSE file.
2package org.openstreetmap.josm.command;
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.conflict.Conflict;
13import org.openstreetmap.josm.data.osm.Node;
14import org.openstreetmap.josm.data.osm.OsmPrimitive;
15import org.openstreetmap.josm.data.osm.Way;
16import org.openstreetmap.josm.tools.ImageProvider;
17
18/**
19 * Represent a command for resolving conflicts in the node list of two
20 * {@link Way}s.
21 *
22 */
23public class WayNodesConflictResolverCommand extends ConflictResolveCommand {
24 /** the conflict to resolve */
25 private Conflict<Way> conflict;
26
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<Node> mergedNodeList;
31
32 /**
33 * @param conflict the conflict data set
34 * @param mergedNodeList the list of merged nodes
35 */
36 @SuppressWarnings("unchecked")
37 public WayNodesConflictResolverCommand(Conflict<? extends OsmPrimitive> conflict, List<Node> mergedNodeList) {
38 this.conflict = (Conflict<Way>) conflict;
39 this.mergedNodeList = mergedNodeList;
40 }
41 @Override
42 public String getDescriptionText() {
43 return tr("Resolve conflicts in node list of way {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 nodes of 'my' way by the list of merged nodes
58 //
59 for (Node n:mergedNodeList) {
60 if (! getLayer().data.getNodes().contains(n)) {
61 Main.warn(tr("Main dataset does not include node {0}", n.toString()));
62 }
63 }
64 conflict.getMy().setNodes(mergedNodeList);
65 rememberConflict(conflict);
66 return true;
67 }
68
69 @Override
70 public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
71 Collection<OsmPrimitive> added) {
72 modified.add(conflict.getMy());
73 }
74}
Note: See TracBrowser for help on using the repository browser.