Changeset 6248 in josm for trunk/src/org/openstreetmap/josm/tools/Shortcut.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/tools/Shortcut.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -371 +371 @@
         if (potentialShortcut != null) {
             // this always is a logic error in the hook
-            System.err.println("CONFLICT WITH SYSTEM KEY "+shortText);
+            Main.error("CONFLICT WITH SYSTEM KEY "+shortText);
             return null;
         }
@@ -415 +415 @@
                     if ( findShortcut(k, newmodifier) == null ) {
                         Shortcut newsc = new Shortcut(shortText, longText, requestedKey, m, k, newmodifier, false, false);
-                        System.out.println(tr("Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''.",
+                        Main.info(tr("Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''.",
                             shortText, conflict.getShortText(), newsc.getKeyText()));
                         newsc.saveDefault();