- Revision
- 377
- Author
- mauro
- Date
- 2007-11-15 03:14:00 -0600 (Thu, 15 Nov 2007)
Log Message
More inlining.
Modified Paths
- trunk/core/src/main/java/org/codehaus/waffle/monitor/AbstractWritingMonitor.java
- trunk/core/src/main/java/org/codehaus/waffle/monitor/CommonsLoggingMonitor.java
Diff
Modified: trunk/core/src/main/java/org/codehaus/waffle/monitor/AbstractWritingMonitor.java (376 => 377)
--- trunk/core/src/main/java/org/codehaus/waffle/monitor/AbstractWritingMonitor.java 2007-11-15 09:02:53 UTC (rev 376) +++ trunk/core/src/main/java/org/codehaus/waffle/monitor/AbstractWritingMonitor.java 2007-11-15 09:14:00 UTC (rev 377) @@ -10,13 +10,13 @@ *****************************************************************************/ package org.codehaus.waffle.monitor; +import static java.text.MessageFormat.format; import static java.util.Arrays.asList; import static org.codehaus.waffle.monitor.Monitor.Level.DEBUG; import static org.codehaus.waffle.monitor.Monitor.Level.INFO; import static org.codehaus.waffle.monitor.Monitor.Level.WARN; import java.lang.reflect.Method; -import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -101,10 +101,6 @@ return templates.get(event); } - protected String format(String template, Object ... arguments) { - return MessageFormat.format(template, arguments); - } - protected void write(String event, Object... arguments) { String message = format(template(event), arguments); write(level(event), message);
Modified: trunk/core/src/main/java/org/codehaus/waffle/monitor/CommonsLoggingMonitor.java (376 => 377)
--- trunk/core/src/main/java/org/codehaus/waffle/monitor/CommonsLoggingMonitor.java 2007-11-15 09:02:53 UTC (rev 376) +++ trunk/core/src/main/java/org/codehaus/waffle/monitor/CommonsLoggingMonitor.java 2007-11-15 09:14:00 UTC (rev 377) @@ -10,6 +10,8 @@ *****************************************************************************/ package org.codehaus.waffle.monitor; +import static java.text.MessageFormat.format; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -54,22 +56,26 @@ switch (level) { case ERROR: if (log.isErrorEnabled()) { - log.error(format(WAFFLE, message)); + Object[] arguments = { message }; + log.error(format(WAFFLE, arguments)); } break; case INFO: if (log.isInfoEnabled()) { - log.info(format(WAFFLE, message)); + Object[] arguments = { message }; + log.info(format(WAFFLE, arguments)); } break; case WARN: if (log.isWarnEnabled()) { - log.warn(format(WAFFLE, message)); + Object[] arguments = { message }; + log.warn(format(WAFFLE, arguments)); } break; case DEBUG: if (log.isDebugEnabled()) { - log.debug(format(WAFFLE, message)); + Object[] arguments = { message }; + log.debug(format(WAFFLE, arguments)); } break; } @@ -78,7 +84,8 @@ @Override protected void trace(Throwable exception) { if (log.isErrorEnabled()) { - log.error(format(WAFFLE, exception.getMessage()), exception); + Object[] arguments = { exception.getMessage() }; + log.error(format(WAFFLE, arguments), exception); } }
To unsubscribe from this list please visit:
