# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1381331850 -7200
# Node ID 637f7fb50abd3d8a4601e6b97f17e54278757da0
# Parent  43f89d9f7238e56bba03cf5b924d8502de284f6f# Parent  ae20214a816ca5b6fab82e8cfe69f863d812e122
Merging the conditional logging checks

diff -r 43f89d9f7238 -r 637f7fb50abd rt/emul/compact/src/main/java/java/util/logging/Logger.java
--- a/rt/emul/compact/src/main/java/java/util/logging/Logger.java	Wed Oct 09 16:53:45 2013 +0200
+++ b/rt/emul/compact/src/main/java/java/util/logging/Logger.java	Wed Oct 09 17:17:30 2013 +0200
@@ -457,16 +457,22 @@
             case "WARNING": method = "warn"; break;
             default: method = "log"; break;
         }
+        
+        String msg = record.getMessage();
+        final Object[] params = record.getParameters();
+        if (params != null && params.length != 0) {
+            for (int i = 0; i < params.length; i++) {
+                msg = msg.replace("{" + i + "}", params[i] == null ? "null" : params[i].toString());
+            }
+        }
 
         consoleLog(
             method, 
-            record.getLoggerName(),
-            record.getMessage()
-        );
+            record.getLoggerName(), msg);
     }
     
     @JavaScriptBody(args = { "method", "logger", "msg" }, body = 
-        "window.console[method]('[' + logger + ']: ' + msg);"
+        "if (console) console[method]('[' + logger + ']: ' + msg);"
     )
     private static native void consoleLog(
         String method, String logger, String msg