Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2B7EF10073 for ; Thu, 1 Aug 2013 06:26:44 +0000 (UTC) Received: (qmail 64827 invoked by uid 500); 1 Aug 2013 06:26:44 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 64793 invoked by uid 500); 1 Aug 2013 06:26:43 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 64785 invoked by uid 99); 1 Aug 2013 06:26:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Aug 2013 06:26:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Aug 2013 06:26:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 63913238890D; Thu, 1 Aug 2013 06:26:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1509091 - in /logging/log4j/log4j2/trunk: api/src/main/java/org/apache/logging/log4j/spi/ api/src/main/java/org/apache/logging/log4j/status/ core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ core/src/main/java/org/apache/l... Date: Thu, 01 Aug 2013 06:26:21 -0000 To: commits@logging.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130801062621.63913238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Thu Aug 1 06:26:20 2013 New Revision: 1509091 URL: http://svn.apache.org/r1509091 Log: - Add missing '@Override' annotations - Add missing '@Override' annotations to implementations of interface methods - Add missing '@Deprecated' annotations Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java?rev=1509091&r1=1509090&r2=1509091&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java Thu Aug 1 06:26:20 2013 @@ -1455,7 +1455,8 @@ public abstract class AbstractLogger imp * @param format The format String. * @param params Arguments specified by the format. */ - public void printf(Level level, String format, Object... params) { + @Override + public void printf(Level level, String format, Object... params) { if (isEnabled(level, null, format, params)) { Message msg = new StringFormattedMessage(format, params); log(null, FQCN, level, msg, msg.getThrowable()); @@ -1469,7 +1470,8 @@ public abstract class AbstractLogger imp * @param format The format String. * @param params Arguments specified by the format. */ - public void printf(Level level, Marker marker, String format, Object... params) { + @Override + public void printf(Level level, Marker marker, String format, Object... params) { if (isEnabled(level, marker, format, params)) { Message msg = new StringFormattedMessage(format, params); log(marker, FQCN, level, msg, msg.getThrowable()); Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java?rev=1509091&r1=1509090&r2=1509091&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java Thu Aug 1 06:26:20 2013 @@ -78,7 +78,8 @@ public class StatusConsoleListener imple * Return the Log Level for which the Listener should receive events. * @return the Log Level. */ - public Level getStatusLevel() { + @Override + public Level getStatusLevel() { return this.level; } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java?rev=1509091&r1=1509090&r2=1509091&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java Thu Aug 1 06:26:20 2013 @@ -122,6 +122,7 @@ public final class FactoryMethodConnecti } // method must be present to compile on Java 7, @Override must be absent to compile on Java 6 + @Override @SuppressWarnings("unused") public java.util.logging.Logger getParentLogger() { throw new UnsupportedOperationException(); Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java?rev=1509091&r1=1509090&r2=1509091&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java Thu Aug 1 06:26:20 2013 @@ -155,6 +155,7 @@ public class BaseConfiguration extends A stopFilter(); } + @Override public boolean isShutdownHookEnabled() { return isShutdownHookEnabled; } Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java?rev=1509091&r1=1509090&r2=1509091&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java (original) +++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java Thu Aug 1 06:26:20 2013 @@ -632,11 +632,13 @@ public class FlumePersistentManager exte private static class Synchronizer extends AbstractQueuedSynchronizer { boolean isSignalled() { return getState() != 0; } - protected int tryAcquireShared(int ignore) { + @Override + protected int tryAcquireShared(int ignore) { return isSignalled()? 1 : -1; } - protected boolean tryReleaseShared(int state) { + @Override + protected boolean tryReleaseShared(int state) { setState(state); return true; }