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

Timestamp:

2013-09-23T16:47:50+02:00 (13 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/Main.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -41 +41 @@
 import javax.swing.KeyStroke;
 import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
 
 import org.openstreetmap.gui.jmapviewer.FeatureAdapter;
@@ -199 +200 @@
 
     /**
-     * Logging level (3 = debug, 2 = info, 1 = warn, 0 = none).
-     */
-    static public int log_level = 2;
-    /**
-     * Print a warning message if logging is on.
+     * Logging level (4 = debug, 3 = info, 2 = warn, 1 = error, 0 = none).
+     * @since 6248
+     */
+    public static int logLevel = 3;
+    
+    /**
+     * Prints an error message if logging is on.
      * @param msg The message to print.
-     */
-    static public void warn(String msg) {
-        if (log_level < 1)
+     * @since 6248
+     */
+    public static void error(String msg) {
+        if (logLevel < 1)
+            return;
+        System.err.println(tr("ERROR: {0}", msg));
+    }
+    
+    /**
+     * Prints a warning message if logging is on.
+     * @param msg The message to print.
+     */
+    public static void warn(String msg) {
+        if (logLevel < 2)
             return;
         System.err.println(tr("WARNING: {0}", msg));
     }
-    /**
-     * Print an informational message if logging is on.
+    
+    /**
+     * Prints an informational message if logging is on.
      * @param msg The message to print.
      */
-    static public void info(String msg) {
-        if (log_level < 2)
+    public static void info(String msg) {
+        if (logLevel < 3)
             return;
-        System.err.println(tr("INFO: {0}", msg));
-    }
-    /**
-     * Print an debug message if logging is on.
+        System.out.println(tr("INFO: {0}", msg));
+    }
+    
+    /**
+     * Prints a debug message if logging is on.
      * @param msg The message to print.
      */
-    static public void debug(String msg) {
-        if (log_level < 3)
+    public static void debug(String msg) {
+        if (logLevel < 4)
             return;
-        System.err.println(tr("DEBUG: {0}", msg));
-    }
-    /**
-     * Print a formated warning message if logging is on. Calls {@link MessageFormat#format}
+        System.out.println(tr("DEBUG: {0}", msg));
+    }
+    
+    /**
+     * Prints a formated error message if logging is on. Calls {@link MessageFormat#format}
      * function to format text.
      * @param msg The formated message to print.
      * @param objects The objects to insert into format string.
-     */
-    static public void warn(String msg, Object... objects) {
-        warn(MessageFormat.format(msg, objects));
-    }
-    /**
-     * Print a formated informational message if logging is on. Calls {@link MessageFormat#format}
+     * @since 6248
+     */
+    public static void error(String msg, Object... objects) {
+        error(MessageFormat.format(msg, objects));
+    }
+    
+    /**
+     * Prints a formated warning message if logging is on. Calls {@link MessageFormat#format}
      * function to format text.
      * @param msg The formated message to print.
      * @param objects The objects to insert into format string.
      */
-    static public void info(String msg, Object... objects) {
-        info(MessageFormat.format(msg, objects));
-    }
-    /**
-     * Print a formated debug message if logging is on. Calls {@link MessageFormat#format}
+    public static void warn(String msg, Object... objects) {
+        warn(MessageFormat.format(msg, objects));
+    }
+    
+    /**
+     * Prints a formated informational message if logging is on. Calls {@link MessageFormat#format}
      * function to format text.
      * @param msg The formated message to print.
      * @param objects The objects to insert into format string.
      */
-    static public void debug(String msg, Object... objects) {
+    public static void info(String msg, Object... objects) {
+        info(MessageFormat.format(msg, objects));
+    }
+    
+    /**
+     * Prints a formated debug message if logging is on. Calls {@link MessageFormat#format}
+     * function to format text.
+     * @param msg The formated message to print.
+     * @param objects The objects to insert into format string.
+     */
+    public static void debug(String msg, Object... objects) {
         debug(MessageFormat.format(msg, objects));
+    }
+    
+    /**
+     * Prints an error message for the given Throwable.
+     * @param t The throwable object causing the error
+     * @since 6248
+     */
+    public static void error(Throwable t) {
+        error(t.getClass().getName()+": "+t.getMessage());
+    }
+    
+    /**
+     * Prints a warning message for the given Throwable.
+     * @param t The throwable object causing the error
+     * @since 6248
+     */
+    public static void warn(Throwable t) {
+        warn(t.getClass().getName()+": "+t.getMessage());
     }
 
@@ -531 +579 @@
         Object existing = inputMap.get(keyStroke);
         if (existing != null && !existing.equals(action)) {
-            System.out.println(String.format("Keystroke %s is already assigned to %s, will be overridden by %s", keyStroke, existing, action));
+            info(String.format("Keystroke %s is already assigned to %s, will be overridden by %s", keyStroke, existing, action));
         }
         inputMap.put(keyStroke, action);
@@ -600 +648 @@
                 UIManager.setLookAndFeel(laf);
             }
-            catch (final java.lang.ClassNotFoundException e) {
-                System.out.println("Look and Feel not found: " + laf);
+            catch (final ClassNotFoundException e) {
+                info("Look and Feel not found: " + laf);
                 Main.pref.put("laf", defaultlaf);
             }
-            catch (final javax.swing.UnsupportedLookAndFeelException e) {
-                System.out.println("Look and Feel not supported: " + laf);
+            catch (final UnsupportedLookAndFeelException e) {
+                info("Look and Feel not supported: " + laf);
                 Main.pref.put("laf", defaultlaf);
             }
@@ -853 +901 @@
         String os = System.getProperty("os.name");
         if (os == null) {
-            System.err.println("Your operating system has no name, so I'm guessing its some kind of *nix.");
+            warn("Your operating system has no name, so I'm guessing its some kind of *nix.");
             platform = new PlatformHookUnixoid();
         } else if (os.toLowerCase().startsWith("windows")) {
@@ -864 +912 @@
             platform = new PlatformHookOsx();
         } else {
-            System.err.println("I don't know your operating system '"+os+"', so I'm guessing its some kind of *nix.");
+            warn("I don't know your operating system '"+os+"', so I'm guessing its some kind of *nix.");
             platform = new PlatformHookUnixoid();
         }
@@ -948 +996 @@
             }
         }
-        System.err.println("Error: Could not recognize Java Version: "+version);
+        error("Could not recognize Java Version: "+version);
     }