From: markt Date: Fri, 17 Dec 2010 22:09:28 +0000 (+0000) Subject: Fix remaining Eclipse warnings in o.a.juli X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4fd4c746aa406d9bf71e2684ecce1bc240b359e1;p=tomcat7.0 Fix remaining Eclipse warnings in o.a.juli git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1050504 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/juli/logging/DirectJDKLog.java b/java/org/apache/juli/logging/DirectJDKLog.java index 71d378433..5da0ceac1 100644 --- a/java/org/apache/juli/logging/DirectJDKLog.java +++ b/java/org/apache/juli/logging/DirectJDKLog.java @@ -71,74 +71,92 @@ class DirectJDKLog implements Log { logger=Logger.getLogger(name); } + @Override public final boolean isErrorEnabled() { return logger.isLoggable(Level.SEVERE); } + @Override public final boolean isWarnEnabled() { return logger.isLoggable(Level.WARNING); } + @Override public final boolean isInfoEnabled() { return logger.isLoggable(Level.INFO); } + @Override public final boolean isDebugEnabled() { return logger.isLoggable(Level.FINE); } + @Override public final boolean isFatalEnabled() { return logger.isLoggable(Level.SEVERE); } + @Override public final boolean isTraceEnabled() { return logger.isLoggable(Level.FINER); } + @Override public final void debug(Object message) { log(Level.FINE, String.valueOf(message), null); } + @Override public final void debug(Object message, Throwable t) { log(Level.FINE, String.valueOf(message), t); } + @Override public final void trace(Object message) { log(Level.FINER, String.valueOf(message), null); } + @Override public final void trace(Object message, Throwable t) { log(Level.FINER, String.valueOf(message), t); } + @Override public final void info(Object message) { log(Level.INFO, String.valueOf(message), null); } + @Override public final void info(Object message, Throwable t) { log(Level.INFO, String.valueOf(message), t); } + @Override public final void warn(Object message) { log(Level.WARNING, String.valueOf(message), null); } + @Override public final void warn(Object message, Throwable t) { log(Level.WARNING, String.valueOf(message), t); } + @Override public final void error(Object message) { log(Level.SEVERE, String.valueOf(message), null); } + @Override public final void error(Object message, Throwable t) { log(Level.SEVERE, String.valueOf(message), t); } + @Override public final void fatal(Object message) { log(Level.SEVERE, String.valueOf(message), null); } + @Override public final void fatal(Object message, Throwable t) { log(Level.SEVERE, String.valueOf(message), t); } diff --git a/java/org/apache/juli/logging/LogFactory.java b/java/org/apache/juli/logging/LogFactory.java index 8f6f544f1..f8ed75fb0 100644 --- a/java/org/apache/juli/logging/LogFactory.java +++ b/java/org/apache/juli/logging/LogFactory.java @@ -321,11 +321,10 @@ public /* abstract */ class LogFactory { * * @param classLoader ClassLoader for which to release the LogFactory */ - public static void release( - @SuppressWarnings("unused") ClassLoader classLoader) { - // JULI's log manager looks at the current classLoader, the default - // implementation does not so calling reset in that case will break - // things + public static void release(ClassLoader classLoader) { + // JULI's log manager looks at the current classLoader so there is no + // need to use the passed in classLoader, the default implementation + // does not so calling reset in that case will break things if (!LogManager.getLogManager().getClass().getName().equals( "java.util.logging.LogManager")) { LogManager.getLogManager().reset();