You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2013/08/01 08:26:21 UTC
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...
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;
}