Changeset 6248 in josm for trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java

Timestamp:

2013-09-23T16:47:50+02:00 (11 years ago)

Author:

Don-vip

Message:

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)

File:

• trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java

@@ -9 +9 @@
 import javax.swing.Icon;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
@@ -54 +55 @@
         super.executeCommand();
 
-        // replace the list of nodes of 'my' way by the list of merged
-        // nodes
+        // replace the list of nodes of 'my' way by the list of merged nodes
         //
         for (Node n:mergedNodeList) {
             if (! getLayer().data.getNodes().contains(n)) {
-                System.out.println(tr("Main dataset does not include node {0}", n.toString()));
+                Main.warn(tr("Main dataset does not include node {0}", n.toString()));
             }
         }