[jboss-svn-commits] JBoss Common SVN: r4003 - jboss-logging/trunk/src/main/java/org/jboss/logging.

[jboss-svn-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2010-02-08 22:39:26 -0500 (Mon, 08 Feb 2010)
New Revision: 4003

Modified:
   jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLevel.java
   jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLogger.java
   jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLogger.java
   jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLocationAwareLogger.java
   jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLogger.java
Log:
Fix string formatting, add missing JDK impl

Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLevel.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLevel.java	2010-02-09 01:10:42 UTC (rev 4002)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLevel.java	2010-02-09 03:39:26 UTC (rev 4003)
@@ -46,4 +46,4 @@
     public static final JDKLevel INFO = new JDKLevel("INFO", 800);
     public static final JDKLevel DEBUG = new JDKLevel("DEBUG", 500);
     public static final JDKLevel TRACE = new JDKLevel("TRACE", 400);
-}
\ No newline at end of file
+}

Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLogger.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLogger.java	2010-02-09 01:10:42 UTC (rev 4002)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLogger.java	2010-02-09 03:39:26 UTC (rev 4003)
@@ -22,6 +22,9 @@
 
 package org.jboss.logging;
 
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
 final class JDKLogger extends Logger {
 
     private static final long serialVersionUID = 2563174097983721393L;
@@ -39,9 +42,35 @@
     }
 
     protected void doLog(final Level level, final String loggerClassName, final Object message, final Object[] parameters, final Throwable thrown) {
+        if (isEnabled(level)) {
+            final JBossLogRecord rec = new JBossLogRecord(translate(level), String.valueOf(message), loggerClassName);
+            if (thrown != null) rec.setThrown(thrown);
+            rec.setLoggerName(getName());
+            rec.setParameters(parameters);
+            rec.setResourceBundleName(logger.getResourceBundleName());
+            rec.setResourceBundle(logger.getResourceBundle());
+            logger.log(rec);
+        }
     }
 
-    protected void doLogf(final Level level, final String loggerClassName, final String format, final Object[] parameters, final Throwable thrown) {
+    protected void doLogf(final Level level, final String loggerClassName, String format, final Object[] parameters, final Throwable thrown) {
+        if (isEnabled(level)) {
+            final ResourceBundle resourceBundle = logger.getResourceBundle();
+            if (resourceBundle != null) try {
+                format = resourceBundle.getString(format);
+            } catch (MissingResourceException e) {
+                // ignore
+            }
+            final String msg = parameters == null ? String.format(format) : String.format(format, parameters);
+            final JBossLogRecord rec = new JBossLogRecord(translate(level), msg, loggerClassName);
+            if (thrown != null) rec.setThrown(thrown);
+            rec.setLoggerName(getName());
+            rec.setResourceBundleName(logger.getResourceBundleName());
+            // we've done all the business
+            rec.setResourceBundle(null);
+            rec.setParameters(null);
+            logger.log(rec);
+        }
     }
 
     private static java.util.logging.Level translate(final Level level) {

Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLogger.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLogger.java	2010-02-09 01:10:42 UTC (rev 4002)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLogger.java	2010-02-09 03:39:26 UTC (rev 4003)
@@ -45,7 +45,7 @@
     }
 
     protected void doLogf(final Level level, final String loggerClassName, final String format, final Object[] parameters, final Throwable thrown) {
-        logger.log(loggerClassName, translate(level), parameters == null || parameters.length == 0 ? format : String.format(format, parameters), thrown);
+        logger.log(loggerClassName, translate(level), parameters == null ? String.format(format) : String.format(format, parameters), thrown);
     }
 
     private static org.apache.log4j.Level translate(final Level level) {

Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLocationAwareLogger.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLocationAwareLogger.java	2010-02-09 01:10:42 UTC (rev 4002)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLocationAwareLogger.java	2010-02-09 03:39:26 UTC (rev 4003)
@@ -57,7 +57,7 @@
 
     protected void doLogf(final Level level, final String loggerClassName, final String format, final Object[] parameters, final Throwable thrown) {
         if (isEnabled(level)) {
-            final String text = parameters == null || parameters.length == 0 ? format : String.format(format, parameters);
+            final String text = parameters == null ? String.format(format) : String.format(format, parameters);
             logger.log(null, loggerClassName, translate(level), text, thrown);
         }
     }

Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLogger.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLogger.java	2010-02-09 01:10:42 UTC (rev 4002)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLogger.java	2010-02-09 03:39:26 UTC (rev 4003)
@@ -73,7 +73,7 @@
 
     protected void doLogf(final Level level, final String loggerClassName, final String format, final Object[] parameters, final Throwable thrown) {
         if (isEnabled(level)) {
-            final String text = parameters == null || parameters.length == 0 ? format : String.format(format, parameters);
+            final String text = parameters == null ? String.format(format) : String.format(format, parameters);
             switch (level) {
                 case FATAL:
                 case ERROR: