Merging the conditional logging checks
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Wed, 09 Oct 2013 17:17:30 +0200
changeset 1356637f7fb50abd
parent 1354 43f89d9f7238
parent 1355 ae20214a816c
child 1357 f5c3f68c0664
Merging the conditional logging checks
rt/emul/compact/src/main/java/java/util/logging/Logger.java
     1.1 --- a/rt/emul/compact/src/main/java/java/util/logging/Logger.java	Wed Oct 09 16:53:45 2013 +0200
     1.2 +++ b/rt/emul/compact/src/main/java/java/util/logging/Logger.java	Wed Oct 09 17:17:30 2013 +0200
     1.3 @@ -457,16 +457,22 @@
     1.4              case "WARNING": method = "warn"; break;
     1.5              default: method = "log"; break;
     1.6          }
     1.7 +        
     1.8 +        String msg = record.getMessage();
     1.9 +        final Object[] params = record.getParameters();
    1.10 +        if (params != null && params.length != 0) {
    1.11 +            for (int i = 0; i < params.length; i++) {
    1.12 +                msg = msg.replace("{" + i + "}", params[i] == null ? "null" : params[i].toString());
    1.13 +            }
    1.14 +        }
    1.15  
    1.16          consoleLog(
    1.17              method, 
    1.18 -            record.getLoggerName(),
    1.19 -            record.getMessage()
    1.20 -        );
    1.21 +            record.getLoggerName(), msg);
    1.22      }
    1.23      
    1.24      @JavaScriptBody(args = { "method", "logger", "msg" }, body = 
    1.25 -        "window.console[method]('[' + logger + ']: ' + msg);"
    1.26 +        "if (console) console[method]('[' + logger + ']: ' + msg);"
    1.27      )
    1.28      private static native void consoleLog(
    1.29          String method, String logger, String msg