Changeset 6248 in josm for trunk/src/org/openstreetmap/josm/command

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)

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• ConflictAddCommand.java (modified) (1 diff)
• ConflictResolveCommand.java (modified) (1 diff)
• RelationMemberConflictResolverCommand.java (modified) (1 diff)
• WayNodesConflictResolverCommand.java (modified) (2 diffs)

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

@@ -49 +49 @@
     @Override public void undoCommand() {
         if (! Main.map.mapView.hasLayer(getLayer())) {
-            System.out.println(tr("Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
+            Main.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
                     getLayer().getName(),
                     conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())

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

@@ -61 +61 @@
 
         if (! Main.map.mapView.hasLayer(getLayer())) {
-            System.out.println(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
+            Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
                     this.toString(),
                     getLayer().toString()

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

@@ -81 +81 @@
     public void undoCommand() {
         if (! Main.map.mapView.hasLayer(layer)) {
-            System.out.println(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
+            Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
                     this.toString(),
                     layer.toString()

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()));
             }
         }