logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1480696 [1/2] - in /logging/log4j/log4j2/trunk: api/src/main/java/org/apache/logging/log4j/ api/src/main/java/org/apache/logging/log4j/message/ api/src/main/java/org/apache/logging/log4j/simple/ api/src/main/java/org/apache/logging/log4j/s...
Date Thu, 09 May 2013 15:35:36 GMT
Author: ggregory
Date: Thu May  9 15:35:35 2013
New Revision: 1480696

URL: http://svn.apache.org/r1480696
Log:
Add missing @Override (Java 6).

Modified:
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/MarkerManager.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/ThreadContext.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/BasicThreadInformation.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ExtendedThreadInformation.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContextFactory.java
    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/spi/DefaultThreadContextMap.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
    logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java
    logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/TestLoggerContextFactory.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeNode.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java
    logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
    logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
    logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
    logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java
    logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/test/FlumeKeyProvider.java
    logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java
    logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java
    logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/JNDIContextFilter.java
    logging/log4j/log4j2/trunk/web/src/main/java/org/apache/logging/log4j/core/web/Log4jContextListener.java

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/MarkerManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/MarkerManager.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/MarkerManager.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/MarkerManager.java Thu May  9 15:35:35 2013
@@ -87,14 +87,17 @@ public final class MarkerManager {
             this.parent = parent;
         }
 
+        @Override
         public String getName() {
             return this.name;
         }
 
+        @Override
         public Marker getParent() {
             return this.parent;
         }
 
+        @Override
         public boolean isInstanceOf(final Marker m) {
             if (m == null) {
                 throw new IllegalArgumentException("A marker parameter is required");
@@ -109,6 +112,7 @@ public final class MarkerManager {
             return false;
         }
 
+        @Override
         public boolean isInstanceOf(final String name) {
             if (name == null) {
                 throw new IllegalArgumentException("A marker name is required");

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/ThreadContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/ThreadContext.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/ThreadContext.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/ThreadContext.java Thu May  9 15:35:35 2013
@@ -453,6 +453,7 @@ public final class ThreadContext  {
             super(collection);
         }
 
+        @Override
         public String pop() {
             final int index = size() - 1;
             if (index >= 0) {
@@ -463,6 +464,7 @@ public final class ThreadContext  {
             throw new NoSuchElementException("The ThreadContext stack is empty");
         }
 
+        @Override
         public String peek() {
             final int index = size() - 1;
             if (index >= 0) {
@@ -471,18 +473,22 @@ public final class ThreadContext  {
             return null;
         }
 
+        @Override
         public void push(final String message) {
             add(message);
         }
 
+        @Override
         public int getDepth() {
             return size();
         }
 
+        @Override
         public List<String> asList() {
             return this;
         }
 
+        @Override
         public void trim(final int depth) {
             if (depth < 0) {
                 throw new IllegalArgumentException("Maximum stack depth cannot be negative");
@@ -493,6 +499,7 @@ public final class ThreadContext  {
 
         }
 
+        @Override
         public ContextStack copy() {
             return new ThreadContextStack(this);
         }

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java Thu May  9 15:35:35 2013
@@ -31,6 +31,7 @@ public abstract class AbstractMessageFac
      *
      * @see org.apache.logging.log4j.message.MessageFactory#newMessage(java.lang.Object)
      */
+    @Override
     public Message newMessage(final Object message) {
         return new ObjectMessage(message);
     }
@@ -40,6 +41,7 @@ public abstract class AbstractMessageFac
      *
      * @see org.apache.logging.log4j.message.MessageFactory#newMessage(java.lang.String)
      */
+    @Override
     public Message newMessage(final String message) {
         return new SimpleMessage(message);
     }
@@ -49,5 +51,6 @@ public abstract class AbstractMessageFac
      *
      * @see org.apache.logging.log4j.message.MessageFactory#newMessage(java.lang.String, java.lang.Object)
      */
+    @Override
     public abstract Message newMessage(String message, Object... params);
 }

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/BasicThreadInformation.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/BasicThreadInformation.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/BasicThreadInformation.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/BasicThreadInformation.java Thu May  9 15:35:35 2013
@@ -79,6 +79,7 @@ class BasicThreadInformation implements 
      * Print the thread information.
      * @param sb The StringBuilder.
      */
+    @Override
     public void printThreadInfo(final StringBuilder sb) {
         sb.append("\"").append(name).append("\" ");
         if (isDaemon) {
@@ -97,6 +98,7 @@ class BasicThreadInformation implements 
      * @param sb The StringBuilder.
      * @param trace The stack trace element array to format.
      */
+    @Override
     public void printStack(final StringBuilder sb, final StackTraceElement[] trace) {
         for (final StackTraceElement element : trace) {
             sb.append("\tat ").append(element).append("\n");

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ExtendedThreadInformation.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ExtendedThreadInformation.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ExtendedThreadInformation.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ExtendedThreadInformation.java Thu May  9 15:35:35 2013
@@ -33,6 +33,7 @@ class ExtendedThreadInformation implemen
         this.info = thread;
     }
 
+    @Override
     public void printThreadInfo(final StringBuilder sb) {
         sb.append("\"").append(info.getThreadName()).append("\"");
         sb.append(" Id=").append(info.getThreadId()).append(" ");
@@ -46,6 +47,7 @@ class ExtendedThreadInformation implemen
         sb.append('\n');
     }
 
+    @Override
     public void printStack(final StringBuilder sb, final StackTraceElement[] stack) {
         int i = 0;
         for (final StackTraceElement element : stack) {

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessage.java Thu May  9 15:35:35 2013
@@ -89,6 +89,7 @@ public class FormattedMessage implements
      * Returns the formatted message.
      * @return the formatted message.
      */
+    @Override
     public String getFormattedMessage() {
         if (formattedMessage == null) {
             if (message == null) {
@@ -103,6 +104,7 @@ public class FormattedMessage implements
      * Returns the message pattern.
      * @return the message pattern.
      */
+    @Override
     public String getFormat() {
         return messagePattern;
     }
@@ -111,6 +113,7 @@ public class FormattedMessage implements
      * Returns the message parameters.
      * @return the message parameters.
      */
+    @Override
     public Object[] getParameters() {
         if (argArray != null) {
             return argArray;
@@ -203,6 +206,7 @@ public class FormattedMessage implements
      *
      * @return null
      */
+    @Override
     public Throwable getThrowable() {
         if (throwable != null) {
             return throwable;

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessage.java Thu May  9 15:35:35 2013
@@ -143,6 +143,7 @@ public class LocalizedMessage implements
      * Set the name of the Logger.
      * @param name The name of the Logger.
      */
+    @Override
     public void setLoggerName(final String name) {
         this.loggerName = name;
     }
@@ -151,6 +152,7 @@ public class LocalizedMessage implements
      * Returns the name of the Logger.
      * @return the name of the Logger.
      */
+    @Override
     public String getLoggerName() {
         return this.loggerName;
     }
@@ -165,6 +167,7 @@ public class LocalizedMessage implements
      * Returns the formatted message after looking up the format in the resource bundle.
      * @return The formatted message String.
      */
+    @Override
     public String getFormattedMessage() {
         if (formattedMessage != null) {
             return formattedMessage;
@@ -187,10 +190,12 @@ public class LocalizedMessage implements
         return formattedMessage;
     }
 
+    @Override
     public String getFormat() {
         return messagePattern;
     }
 
+    @Override
     public Object[] getParameters() {
         if (argArray != null) {
             return argArray;
@@ -198,6 +203,7 @@ public class LocalizedMessage implements
         return stringArgs;
     }
 
+    @Override
     public Throwable getThrowable() {
         return throwable;
     }

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MapMessage.java Thu May  9 15:35:35 2013
@@ -59,6 +59,7 @@ public class MapMessage implements Multi
         this.data = map instanceof SortedMap ? (SortedMap<String, String>) map : new TreeMap<String, String>(map);
     }
 
+    @Override
     public String[] getFormats() {
         final String[] formats = new String[MapFormat.values().length];
         int i = 0;
@@ -72,6 +73,7 @@ public class MapMessage implements Multi
      * Returns the data elements as if they were parameters on the logging event.
      * @return the data elements.
      */
+    @Override
     public Object[] getParameters() {
         return data.values().toArray();
     }
@@ -80,6 +82,7 @@ public class MapMessage implements Multi
      * Returns the message.
      * @return the message.
      */
+    @Override
     public String getFormat() {
         return "";
     }
@@ -203,6 +206,7 @@ public class MapMessage implements Multi
      * Format the message and return it.
      * @return the formatted message.
      */
+    @Override
     public String getFormattedMessage() {
         return asString();
     }
@@ -215,6 +219,7 @@ public class MapMessage implements Multi
      *
      * @return The formatted message.
      */
+    @Override
     public String getFormattedMessage(final String[] formats) {
         if (formats == null || formats.length == 0) {
             return asString();
@@ -302,6 +307,7 @@ public class MapMessage implements Multi
      *
      * @return null
      */
+    @Override
     public Throwable getThrowable() {
         return null;
     }

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessage.java Thu May  9 15:35:35 2013
@@ -51,6 +51,7 @@ public class MessageFormatMessage implem
      * Returns the formatted message.
      * @return the formatted message.
      */
+    @Override
     public String getFormattedMessage() {
         if (formattedMessage == null) {
             formattedMessage = formatMessage(messagePattern, argArray);
@@ -62,6 +63,7 @@ public class MessageFormatMessage implem
      * Returns the message pattern.
      * @return the message pattern.
      */
+    @Override
     public String getFormat() {
         return messagePattern;
     }
@@ -70,6 +72,7 @@ public class MessageFormatMessage implem
      * Returns the message parameters.
      * @return the message parameters.
      */
+    @Override
     public Object[] getParameters() {
         if (argArray != null) {
             return argArray;
@@ -151,6 +154,7 @@ public class MessageFormatMessage implem
      *
      * @return null
      */
+    @Override
     public Throwable getThrowable() {
         return null;
     }

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java Thu May  9 15:35:35 2013
@@ -45,6 +45,7 @@ public class ObjectMessage implements Me
      * Returns the formatted object message.
      * @return the formatted object message.
      */
+    @Override
     public String getFormattedMessage() {
         return obj.toString();
     }
@@ -53,6 +54,7 @@ public class ObjectMessage implements Me
      * Returns the object formatted using its toString method.
      * @return the String representation of the object.
      */
+    @Override
     public String getFormat() {
         return obj.toString();
     }
@@ -61,6 +63,7 @@ public class ObjectMessage implements Me
      * Returns the object as if it were a parameter.
      * @return The object.
      */
+    @Override
     public Object[] getParameters() {
         return new Object[]{obj};
     }
@@ -108,6 +111,7 @@ public class ObjectMessage implements Me
      *
      * @return the message if it is a throwable.
      */
+    @Override
     public Throwable getThrowable() {
         return obj instanceof Throwable ? (Throwable) obj : null;
     }

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java Thu May  9 15:35:35 2013
@@ -163,6 +163,7 @@ public class ParameterizedMessage implem
      * Returns the formatted message.
      * @return the formatted message.
      */
+    @Override
     public String getFormattedMessage() {
         if (formattedMessage == null) {
             formattedMessage = formatMessage(messagePattern, stringArgs);
@@ -174,6 +175,7 @@ public class ParameterizedMessage implem
      * Returns the message pattern.
      * @return the message pattern.
      */
+    @Override
     public String getFormat() {
         return messagePattern;
     }
@@ -182,6 +184,7 @@ public class ParameterizedMessage implem
      * Returns the message parameters.
      * @return the message parameters.
      */
+    @Override
     public Object[] getParameters() {
         if (argArray != null) {
             return argArray;
@@ -198,6 +201,7 @@ public class ParameterizedMessage implem
      *
      * @return the Throwable, if any.
      */
+    @Override
     public Throwable getThrowable() {
         return throwable;
     }

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java Thu May  9 15:35:35 2013
@@ -43,6 +43,7 @@ public class SimpleMessage implements Me
      * Returns the message.
      * @return the message.
      */
+    @Override
     public String getFormattedMessage() {
         return message;
     }
@@ -51,6 +52,7 @@ public class SimpleMessage implements Me
      * Returns the message.
      * @return the message.
      */
+    @Override
     public String getFormat() {
         return message;
     }
@@ -59,6 +61,7 @@ public class SimpleMessage implements Me
      * Returns null since there are no parameters.
      * @return null.
      */
+    @Override
     public Object[] getParameters() {
         return null;
     }
@@ -92,6 +95,7 @@ public class SimpleMessage implements Me
      *
      * @return null
      */
+    @Override
     public Throwable getThrowable() {
         return null;
     }

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java Thu May  9 15:35:35 2013
@@ -50,6 +50,7 @@ public class StringFormattedMessage impl
      * Returns the formatted message.
      * @return the formatted message.
      */
+    @Override
     public String getFormattedMessage() {
         if (formattedMessage == null) {
             formattedMessage = formatMessage(messagePattern, argArray);
@@ -61,6 +62,7 @@ public class StringFormattedMessage impl
      * Returns the message pattern.
      * @return the message pattern.
      */
+    @Override
     public String getFormat() {
         return messagePattern;
     }
@@ -69,6 +71,7 @@ public class StringFormattedMessage impl
      * Returns the message parameters.
      * @return the message parameters.
      */
+    @Override
     public Object[] getParameters() {
         if (argArray != null) {
             return argArray;
@@ -150,6 +153,7 @@ public class StringFormattedMessage impl
      *
      * @return null
      */
+    @Override
     public Throwable getThrowable() {
         return null;
     }

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java Thu May  9 15:35:35 2013
@@ -81,6 +81,7 @@ public class ThreadDumpMessage implement
      * Returns the ThreadDump in printable format.
      * @return the ThreadDump suitable for logging.
      */
+    @Override
     public String getFormattedMessage() {
         if (formattedMessage != null) {
             return formattedMessage;
@@ -102,6 +103,7 @@ public class ThreadDumpMessage implement
      * Returns the title.
      * @return the title.
      */
+    @Override
     public String getFormat() {
         return title == null ? "" : title;
     }
@@ -111,6 +113,7 @@ public class ThreadDumpMessage implement
      * and the StackTraceElement array as the value;
      * @return the "parameters" to this Message.
      */
+    @Override
     public Object[] getParameters() {
         return null;
     }
@@ -162,6 +165,7 @@ public class ThreadDumpMessage implement
      * Factory to create basic thread information.
      */
     private static class BasicThreadInfoFactory implements ThreadInfoFactory {
+        @Override
         public Map<ThreadInformation, StackTraceElement[]> createThreadInfo() {
             final Map<Thread, StackTraceElement[]> map = Thread.getAllStackTraces();
             final Map<ThreadInformation, StackTraceElement[]> threads =
@@ -177,6 +181,7 @@ public class ThreadDumpMessage implement
      * Factory to create extended thread information.
      */
     private static class ExtendedThreadInfoFactory implements ThreadInfoFactory {
+        @Override
         public Map<ThreadInformation, StackTraceElement[]> createThreadInfo() {
             final ThreadMXBean bean = ManagementFactory.getThreadMXBean();
             final ThreadInfo[] array = bean.dumpAllThreads(true, true);
@@ -195,6 +200,7 @@ public class ThreadDumpMessage implement
      *
      * @return null
      */
+    @Override
     public Throwable getThrowable() {
         return null;
     }

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java Thu May  9 15:35:35 2013
@@ -96,10 +96,12 @@ public class SimpleLoggerContext impleme
         this.stream = ps;
     }
 
+    @Override
     public Logger getLogger(final String name) {
         return getLogger(name, null);
     }
 
+    @Override
     public Logger getLogger(final String name, final MessageFactory messageFactory) {
         if (loggers.containsKey(name)) {
             final Logger logger = loggers.get(name);
@@ -112,10 +114,12 @@ public class SimpleLoggerContext impleme
         return loggers.get(name);
     }
 
+    @Override
     public boolean hasLogger(final String name) {
         return false;
     }
 
+    @Override
     public Object getExternalContext() {
         return null;
     }

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContextFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContextFactory.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContextFactory.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContextFactory.java Thu May  9 15:35:35 2013
@@ -28,10 +28,12 @@ public class SimpleLoggerContextFactory 
 
     private static LoggerContext context = new SimpleLoggerContext();
 
+    @Override
     public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext) {
         return context;
     }
 
+    @Override
     public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext,
                                     URI configLocation) {
         return context;

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=1480696&r1=1480695&r2=1480696&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 May  9 15:35:35 2013
@@ -142,6 +142,7 @@ public abstract class AbstractLogger imp
      * @param level The logging Level.
      * @param t     The Throwable.
      */
+    @Override
     public void catching(final Level level, final Throwable t) {
         catching(FQCN, level, t);
     }
@@ -151,6 +152,7 @@ public abstract class AbstractLogger imp
      *
      * @param t The Throwable.
      */
+    @Override
     public void catching(final Throwable t) {
         catching(FQCN, Level.ERROR, t);
     }
@@ -184,6 +186,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement
      * @param msg    the message string to be logged
      */
+    @Override
     public void debug(final Marker marker, final Message msg) {
         if (isEnabled(Level.DEBUG, marker, msg, null)) {
             log(marker, FQCN, Level.DEBUG, msg, null);
@@ -197,6 +200,7 @@ public abstract class AbstractLogger imp
      * @param msg    the message string to be logged
      * @param t      A Throwable or null.
      */
+    @Override
     public void debug(final Marker marker, final Message msg, final Throwable t) {
         if (isEnabled(Level.DEBUG, marker, msg, t)) {
             log(marker, FQCN, Level.DEBUG, msg, t);
@@ -209,6 +213,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement.
      * @param message the message object to log.
      */
+    @Override
     public void debug(final Marker marker, final Object message) {
         if (isEnabled(Level.DEBUG, marker, message, null)) {
             log(marker, FQCN, Level.DEBUG, messageFactory.newMessage(message), null);
@@ -223,6 +228,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void debug(final Marker marker, final Object message, final Throwable t) {
         if (isEnabled(Level.DEBUG, marker, message, t)) {
             log(marker, FQCN, Level.DEBUG, messageFactory.newMessage(message), t);
@@ -235,6 +241,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement.
      * @param message the message object to log.
      */
+    @Override
     public void debug(final Marker marker, final String message) {
         if (isEnabled(Level.DEBUG, marker, message)) {
             log(marker, FQCN, Level.DEBUG, messageFactory.newMessage(message), null);
@@ -248,6 +255,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param params  parameters to the message.
      */
+    @Override
     public void debug(final Marker marker, final String message, final Object... params) {
         if (isEnabled(Level.DEBUG, marker, message, params)) {
             final Message msg = messageFactory.newMessage(message, params);
@@ -263,6 +271,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void debug(final Marker marker, final String message, final Throwable t) {
         if (isEnabled(Level.DEBUG, marker, message, t)) {
             log(marker, FQCN, Level.DEBUG, messageFactory.newMessage(message), t);
@@ -274,6 +283,7 @@ public abstract class AbstractLogger imp
      *
      * @param msg the message string to be logged
      */
+    @Override
     public void debug(final Message msg) {
         if (isEnabled(Level.DEBUG, null, msg, null)) {
             log(null, FQCN, Level.DEBUG, msg, null);
@@ -286,6 +296,7 @@ public abstract class AbstractLogger imp
      * @param msg the message string to be logged
      * @param t   A Throwable or null.
      */
+    @Override
     public void debug(final Message msg, final Throwable t) {
         if (isEnabled(Level.DEBUG, null, msg, t)) {
             log(null, FQCN, Level.DEBUG, msg, t);
@@ -297,6 +308,7 @@ public abstract class AbstractLogger imp
      *
      * @param message the message object to log.
      */
+    @Override
     public void debug(final Object message) {
         if (isEnabled(Level.DEBUG, null, message, null)) {
             log(null, FQCN, Level.DEBUG, messageFactory.newMessage(message), null);
@@ -310,6 +322,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void debug(final Object message, final Throwable t) {
         if (isEnabled(Level.DEBUG, null, message, t)) {
             log(null, FQCN, Level.DEBUG, messageFactory.newMessage(message), t);
@@ -321,6 +334,7 @@ public abstract class AbstractLogger imp
      *
      * @param message the message object to log.
      */
+    @Override
     public void debug(final String message) {
         if (isEnabled(Level.DEBUG, null, message)) {
             log(null, FQCN, Level.DEBUG, messageFactory.newMessage(message), null);
@@ -333,6 +347,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param params  parameters to the message.
      */
+    @Override
     public void debug(final String message, final Object... params) {
         if (isEnabled(Level.DEBUG, null, message, params)) {
             final Message msg = messageFactory.newMessage(message, params);
@@ -347,6 +362,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void debug(final String message, final Throwable t) {
         if (isEnabled(Level.DEBUG, null, message, t)) {
             log(null, FQCN, Level.DEBUG, messageFactory.newMessage(message), t);
@@ -356,6 +372,7 @@ public abstract class AbstractLogger imp
     /**
      * Logs entry to a method.
      */
+    @Override
     public void entry() {
         entry(FQCN);
     }
@@ -365,6 +382,7 @@ public abstract class AbstractLogger imp
      *
      * @param params The parameters to the method.
      */
+    @Override
     public void entry(final Object... params) {
         entry(FQCN, params);
     }
@@ -408,6 +426,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement
      * @param msg    the message string to be logged
      */
+    @Override
     public void error(final Marker marker, final Message msg) {
         if (isEnabled(Level.ERROR, marker, msg, null)) {
             log(marker, FQCN, Level.ERROR, msg, null);
@@ -421,6 +440,7 @@ public abstract class AbstractLogger imp
      * @param msg    the message string to be logged
      * @param t      A Throwable or null.
      */
+    @Override
     public void error(final Marker marker, final Message msg, final Throwable t) {
         if (isEnabled(Level.ERROR, marker, msg, t)) {
             log(marker, FQCN, Level.ERROR, msg, t);
@@ -433,6 +453,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement.
      * @param message the message object to log.
      */
+    @Override
     public void error(final Marker marker, final Object message) {
         if (isEnabled(Level.ERROR, marker, message, null)) {
             log(marker, FQCN, Level.ERROR, messageFactory.newMessage(message), null);
@@ -447,6 +468,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void error(final Marker marker, final Object message, final Throwable t) {
         if (isEnabled(Level.ERROR, marker, message, t)) {
             log(marker, FQCN, Level.ERROR, messageFactory.newMessage(message), t);
@@ -459,6 +481,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement.
      * @param message the message object to log.
      */
+    @Override
     public void error(final Marker marker, final String message) {
         if (isEnabled(Level.ERROR, marker, message)) {
             log(marker, FQCN, Level.ERROR, messageFactory.newMessage(message), null);
@@ -472,6 +495,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param params  parameters to the message.
      */
+    @Override
     public void error(final Marker marker, final String message, final Object... params) {
         if (isEnabled(Level.ERROR, marker, message, params)) {
             final Message msg = messageFactory.newMessage(message, params);
@@ -487,6 +511,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void error(final Marker marker, final String message, final Throwable t) {
         if (isEnabled(Level.ERROR, marker, message, t)) {
             log(marker, FQCN, Level.ERROR, messageFactory.newMessage(message), t);
@@ -498,6 +523,7 @@ public abstract class AbstractLogger imp
      *
      * @param msg the message string to be logged
      */
+    @Override
     public void error(final Message msg) {
         if (isEnabled(Level.ERROR, null, msg, null)) {
             log(null, FQCN, Level.ERROR, msg, null);
@@ -510,6 +536,7 @@ public abstract class AbstractLogger imp
      * @param msg the message string to be logged
      * @param t   A Throwable or null.
      */
+    @Override
     public void error(final Message msg, final Throwable t) {
         if (isEnabled(Level.ERROR, null, msg, t)) {
             log(null, FQCN, Level.ERROR, msg, t);
@@ -521,6 +548,7 @@ public abstract class AbstractLogger imp
      *
      * @param message the message object to log.
      */
+    @Override
     public void error(final Object message) {
         if (isEnabled(Level.ERROR, null, message, null)) {
             log(null, FQCN, Level.ERROR, messageFactory.newMessage(message), null);
@@ -534,6 +562,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void error(final Object message, final Throwable t) {
         if (isEnabled(Level.ERROR, null, message, t)) {
             log(null, FQCN, Level.ERROR, messageFactory.newMessage(message), t);
@@ -545,6 +574,7 @@ public abstract class AbstractLogger imp
      *
      * @param message the message object to log.
      */
+    @Override
     public void error(final String message) {
         if (isEnabled(Level.ERROR, null, message)) {
             log(null, FQCN, Level.ERROR, messageFactory.newMessage(message), null);
@@ -557,6 +587,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param params  parameters to the message.
      */
+    @Override
     public void error(final String message, final Object... params) {
         if (isEnabled(Level.ERROR, null, message, params)) {
             final Message msg = messageFactory.newMessage(message, params);
@@ -571,6 +602,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void error(final String message, final Throwable t) {
         if (isEnabled(Level.ERROR, null, message, t)) {
             log(null, FQCN, Level.ERROR, messageFactory.newMessage(message), t);
@@ -580,6 +612,7 @@ public abstract class AbstractLogger imp
     /**
      * Logs exit from a method.
      */
+    @Override
     public void exit() {
         exit(FQCN, null);
     }
@@ -591,6 +624,7 @@ public abstract class AbstractLogger imp
      * @param result The result being returned from the method call.
      * @return the Throwable.
      */
+    @Override
     public <R> R exit(final R result) {
         return exit(FQCN, result);
     }
@@ -615,6 +649,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement
      * @param msg    the message string to be logged
      */
+    @Override
     public void fatal(final Marker marker, final Message msg) {
         if (isEnabled(Level.FATAL, marker, msg, null)) {
             log(marker, FQCN, Level.FATAL, msg, null);
@@ -628,6 +663,7 @@ public abstract class AbstractLogger imp
      * @param msg    the message string to be logged
      * @param t      A Throwable or null.
      */
+    @Override
     public void fatal(final Marker marker, final Message msg, final Throwable t) {
         if (isEnabled(Level.FATAL, marker, msg, t)) {
             log(marker, FQCN, Level.FATAL, msg, t);
@@ -640,6 +676,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement.
      * @param message the message object to log.
      */
+    @Override
     public void fatal(final Marker marker, final Object message) {
         if (isEnabled(Level.FATAL, marker, message, null)) {
             log(marker, FQCN, Level.FATAL, messageFactory.newMessage(message), null);
@@ -654,6 +691,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void fatal(final Marker marker, final Object message, final Throwable t) {
         if (isEnabled(Level.FATAL, marker, message, t)) {
             log(marker, FQCN, Level.FATAL, messageFactory.newMessage(message), t);
@@ -666,6 +704,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement.
      * @param message the message object to log.
      */
+    @Override
     public void fatal(final Marker marker, final String message) {
         if (isEnabled(Level.FATAL, marker, message)) {
             log(marker, FQCN, Level.FATAL, messageFactory.newMessage(message), null);
@@ -679,6 +718,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param params  parameters to the message.
      */
+    @Override
     public void fatal(final Marker marker, final String message, final Object... params) {
         if (isEnabled(Level.FATAL, marker, message, params)) {
             final Message msg = messageFactory.newMessage(message, params);
@@ -694,6 +734,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void fatal(final Marker marker, final String message, final Throwable t) {
         if (isEnabled(Level.FATAL, marker, message, t)) {
             log(marker, FQCN, Level.FATAL, messageFactory.newMessage(message), t);
@@ -704,6 +745,7 @@ public abstract class AbstractLogger imp
      *
      * @param msg the message string to be logged
      */
+    @Override
     public void fatal(final Message msg) {
         if (isEnabled(Level.FATAL, null, msg, null)) {
             log(null, FQCN, Level.FATAL, msg, null);
@@ -716,6 +758,7 @@ public abstract class AbstractLogger imp
      * @param msg the message string to be logged
      * @param t   A Throwable or null.
      */
+    @Override
     public void fatal(final Message msg, final Throwable t) {
         if (isEnabled(Level.FATAL, null, msg, t)) {
             log(null, FQCN, Level.FATAL, msg, t);
@@ -727,6 +770,7 @@ public abstract class AbstractLogger imp
      *
      * @param message the message object to log.
      */
+    @Override
     public void fatal(final Object message) {
         if (isEnabled(Level.FATAL, null, message, null)) {
             log(null, FQCN, Level.FATAL, messageFactory.newMessage(message), null);
@@ -740,6 +784,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void fatal(final Object message, final Throwable t) {
         if (isEnabled(Level.FATAL, null, message, t)) {
             log(null, FQCN, Level.FATAL, messageFactory.newMessage(message), t);
@@ -751,6 +796,7 @@ public abstract class AbstractLogger imp
      *
      * @param message the message object to log.
      */
+    @Override
     public void fatal(final String message) {
         if (isEnabled(Level.FATAL, null, message)) {
             log(null, FQCN, Level.FATAL, messageFactory.newMessage(message), null);
@@ -763,6 +809,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param params  parameters to the message.
      */
+    @Override
     public void fatal(final String message, final Object... params) {
         if (isEnabled(Level.FATAL, null, message, params)) {
             final Message msg = messageFactory.newMessage(message, params);
@@ -777,6 +824,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void fatal(final String message, final Throwable t) {
         if (isEnabled(Level.FATAL, null, message, t)) {
             log(null, FQCN, Level.FATAL, messageFactory.newMessage(message), t);
@@ -788,6 +836,7 @@ public abstract class AbstractLogger imp
      *
      * @return the message factory.
      */
+    @Override
     public MessageFactory getMessageFactory() {
         return messageFactory;
     }
@@ -795,6 +844,7 @@ public abstract class AbstractLogger imp
     /* (non-Javadoc)
      * @see org.apache.logging.log4j.Logger#getName()
      */
+    @Override
     public String getName() {
         return name;
     }
@@ -805,6 +855,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement
      * @param msg    the message string to be logged
      */
+    @Override
     public void info(final Marker marker, final Message msg) {
         if (isEnabled(Level.INFO, marker, msg, null)) {
             log(marker, FQCN, Level.INFO, msg, null);
@@ -818,6 +869,7 @@ public abstract class AbstractLogger imp
      * @param msg    the message string to be logged
      * @param t      A Throwable or null.
      */
+    @Override
     public void info(final Marker marker, final Message msg, final Throwable t) {
         if (isEnabled(Level.INFO, marker, msg, t)) {
             log(marker, FQCN, Level.INFO, msg, t);
@@ -830,6 +882,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement.
      * @param message the message object to log.
      */
+    @Override
     public void info(final Marker marker, final Object message) {
         if (isEnabled(Level.INFO, marker, message, null)) {
             log(marker, FQCN, Level.INFO, messageFactory.newMessage(message), null);
@@ -844,6 +897,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void info(final Marker marker, final Object message, final Throwable t) {
         if (isEnabled(Level.INFO, marker, message, t)) {
             log(marker, FQCN, Level.INFO, messageFactory.newMessage(message), t);
@@ -856,6 +910,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement.
      * @param message the message object to log.
      */
+    @Override
     public void info(final Marker marker, final String message) {
         if (isEnabled(Level.INFO, marker, message)) {
             log(marker, FQCN, Level.INFO, messageFactory.newMessage(message), null);
@@ -869,6 +924,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param params  parameters to the message.
      */
+    @Override
     public void info(final Marker marker, final String message, final Object... params) {
         if (isEnabled(Level.INFO, marker, message, params)) {
             final Message msg = messageFactory.newMessage(message, params);
@@ -884,6 +940,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void info(final Marker marker, final String message, final Throwable t) {
         if (isEnabled(Level.INFO, marker, message, t)) {
             log(marker, FQCN, Level.INFO, messageFactory.newMessage(message), t);
@@ -895,6 +952,7 @@ public abstract class AbstractLogger imp
      *
      * @param msg the message string to be logged
      */
+    @Override
     public void info(final Message msg) {
         if (isEnabled(Level.INFO, null, msg, null)) {
             log(null, FQCN, Level.INFO, msg, null);
@@ -907,6 +965,7 @@ public abstract class AbstractLogger imp
      * @param msg the message string to be logged
      * @param t   A Throwable or null.
      */
+    @Override
     public void info(final Message msg, final Throwable t) {
         if (isEnabled(Level.INFO, null, msg, t)) {
             log(null, FQCN, Level.INFO, msg, t);
@@ -918,6 +977,7 @@ public abstract class AbstractLogger imp
      *
      * @param message the message object to log.
      */
+    @Override
     public void info(final Object message) {
         if (isEnabled(Level.INFO, null, message, null)) {
             log(null, FQCN, Level.INFO, messageFactory.newMessage(message), null);
@@ -932,6 +992,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void info(final Object message, final Throwable t) {
         if (isEnabled(Level.INFO, null, message, t)) {
             log(null, FQCN, Level.INFO, messageFactory.newMessage(message), t);
@@ -943,6 +1004,7 @@ public abstract class AbstractLogger imp
      *
      * @param message the message object to log.
      */
+    @Override
     public void info(final String message) {
         if (isEnabled(Level.INFO, null, message)) {
             log(null, FQCN, Level.INFO, messageFactory.newMessage(message), null);
@@ -955,6 +1017,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param params  parameters to the message.
      */
+    @Override
     public void info(final String message, final Object... params) {
         if (isEnabled(Level.INFO, null, message, params)) {
             final Message msg = messageFactory.newMessage(message, params);
@@ -969,6 +1032,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void info(final String message, final Throwable t) {
         if (isEnabled(Level.INFO, null, message, t)) {
             log(null, FQCN, Level.INFO, messageFactory.newMessage(message), t);
@@ -981,6 +1045,7 @@ public abstract class AbstractLogger imp
      * @return boolean - {@code true} if this Logger is enabled for level
      *         DEBUG, {@code false} otherwise.
      */
+    @Override
     public boolean isDebugEnabled() {
         return isEnabled(Level.DEBUG, null, null);
     }
@@ -992,6 +1057,7 @@ public abstract class AbstractLogger imp
      * @return boolean - {@code true} if this Logger is enabled for level
      *         DEBUG, {@code false} otherwise.
      */
+    @Override
     public boolean isDebugEnabled(final Marker marker) {
         return isEnabled(Level.DEBUG, marker, (Object) null, null);
     }
@@ -1004,6 +1070,7 @@ public abstract class AbstractLogger imp
      * @param level the level to check
      * @return boolean - {@code true} if this Logger is enabled for level, {@code false} otherwise.
      */
+    @Override
     public boolean isEnabled(final Level level) {
         return isEnabled(level, null, (Object) null, null);
     }
@@ -1063,6 +1130,7 @@ public abstract class AbstractLogger imp
      * @return boolean - {@code true} if this Logger is enabled for level
      *         {@link Level#ERROR ERROR}, {@code false} otherwise.
      */
+    @Override
     public boolean isErrorEnabled() {
         return isEnabled(Level.ERROR, null, (Object) null, null);
     }
@@ -1074,6 +1142,7 @@ public abstract class AbstractLogger imp
      * @return boolean - {@code true} if this Logger is enabled for level
      *         {@link Level#ERROR ERROR}, {@code false} otherwise.
      */
+    @Override
     public boolean isErrorEnabled(final Marker marker) {
         return isEnabled(Level.ERROR, marker, (Object) null, null);
     }
@@ -1084,6 +1153,7 @@ public abstract class AbstractLogger imp
      * @return boolean - {@code true} if this Logger is enabled for level
      *         FATAL, {@code false} otherwise.
      */
+    @Override
     public boolean isFatalEnabled() {
         return isEnabled(Level.FATAL, null, (Object) null, null);
     }
@@ -1095,6 +1165,7 @@ public abstract class AbstractLogger imp
      * @return boolean - {@code true} if this Logger is enabled for level
      *         FATAL, {@code false} otherwise.
      */
+    @Override
     public boolean isFatalEnabled(final Marker marker) {
         return isEnabled(Level.FATAL, marker, (Object) null, null);
     }
@@ -1105,6 +1176,7 @@ public abstract class AbstractLogger imp
      * @return boolean - {@code true} if this Logger is enabled for level
      *         INFO, {@code false} otherwise.
      */
+    @Override
     public boolean isInfoEnabled() {
         return isEnabled(Level.INFO, null, (Object) null, null);
     }
@@ -1115,6 +1187,7 @@ public abstract class AbstractLogger imp
      * @return boolean - {@code true} if this Logger is enabled for level
      *         INFO, {@code false} otherwise.
      */
+    @Override
     public boolean isInfoEnabled(final Marker marker) {
         return isEnabled(Level.INFO, marker, (Object) null, null);
     }
@@ -1125,6 +1198,7 @@ public abstract class AbstractLogger imp
      * @return boolean - {@code true} if this Logger is enabled for level
      *         TRACE, {@code false} otherwise.
      */
+    @Override
     public boolean isTraceEnabled() {
         return isEnabled(Level.TRACE, null, (Object) null, null);
     }
@@ -1136,6 +1210,7 @@ public abstract class AbstractLogger imp
      * @return boolean - {@code true} if this Logger is enabled for level
      *         TRACE, {@code false} otherwise.
      */
+    @Override
     public boolean isTraceEnabled(final Marker marker) {
         return isEnabled(Level.TRACE, marker, (Object) null, null);
     }
@@ -1147,6 +1222,7 @@ public abstract class AbstractLogger imp
      * @return boolean - {@code true} if this Logger is enabled for level
      *         WARN, {@code false} otherwise.
      */
+    @Override
     public boolean isWarnEnabled() {
         return isEnabled(Level.WARN, null, (Object) null, null);
     }
@@ -1158,10 +1234,12 @@ public abstract class AbstractLogger imp
      * @return boolean - {@code true} if this Logger is enabled for level
      *         WARN, {@code false} otherwise.
      */
+    @Override
     public boolean isWarnEnabled(final Marker marker) {
         return isEnabled(Level.WARN, marker, (Object) null, null);
     }
 
+    @Override
     public boolean isEnabled(final Level level, final Marker marker) {
         return isEnabled(level, marker, (Object) null, null);
     }
@@ -1173,6 +1251,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement
      * @param msg the message string to be logged
      */
+    @Override
     public void log(final Level level, final Marker marker, final Message msg) {
         if (isEnabled(level, marker, msg, null)) {
             log(marker, FQCN, level, msg, null);
@@ -1187,6 +1266,7 @@ public abstract class AbstractLogger imp
      * @param msg the message string to be logged
      * @param t A Throwable or null.
      */
+    @Override
     public void log(final Level level, final Marker marker, final Message msg, final Throwable t) {
         if (isEnabled(level, marker, msg, t)) {
             log(marker, FQCN, level, msg, t);
@@ -1200,6 +1280,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement.
      * @param message the message object to log.
      */
+    @Override
     public void log(final Level level, final Marker marker, final Object message) {
         if (isEnabled(level, marker, message, null)) {
             log(marker, FQCN, level, messageFactory.newMessage(message), null);
@@ -1215,6 +1296,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param t the exception to log, including its stack trace.
      */
+    @Override
     public void log(final Level level, final Marker marker, final Object message, final Throwable t) {
         if (isEnabled(level, marker, message, t)) {
             log(marker, FQCN, level, messageFactory.newMessage(message), t);
@@ -1228,6 +1310,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement.
      * @param message the message object to log.
      */
+    @Override
     public void log(final Level level, final Marker marker, final String message) {
         if (isEnabled(level, marker, message)) {
             log(marker, FQCN, level, messageFactory.newMessage(message), null);
@@ -1242,6 +1325,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param params parameters to the message.
      */
+    @Override
     public void log(final Level level, final Marker marker, final String message, final Object... params) {
         if (isEnabled(level, marker, message, params)) {
             final Message msg = messageFactory.newMessage(message, params);
@@ -1258,6 +1342,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param t the exception to log, including its stack trace.
      */
+    @Override
     public void log(final Level level, final Marker marker, final String message, final Throwable t) {
         if (isEnabled(level, marker, message, t)) {
             log(marker, FQCN, level, messageFactory.newMessage(message), t);
@@ -1270,6 +1355,7 @@ public abstract class AbstractLogger imp
      * @param level the logging level
      * @param msg the message string to be logged
      */
+    @Override
     public void log(final Level level, final Message msg) {
         if (isEnabled(level, null, msg, null)) {
             log(null, FQCN, level, msg, null);
@@ -1283,6 +1369,7 @@ public abstract class AbstractLogger imp
      * @param msg the message string to be logged
      * @param t A Throwable or null.
      */
+    @Override
     public void log(final Level level, final Message msg, final Throwable t) {
         if (isEnabled(level, null, msg, t)) {
             log(null, FQCN, level, msg, t);
@@ -1295,6 +1382,7 @@ public abstract class AbstractLogger imp
      * @param level the logging level
      * @param message the message object to log.
      */
+    @Override
     public void log(final Level level, final Object message) {
         if (isEnabled(level, null, message, null)) {
             log(null, FQCN, level, messageFactory.newMessage(message), null);
@@ -1309,6 +1397,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param t the exception to log, including its stack trace.
      */
+    @Override
     public void log(final Level level, final Object message, final Throwable t) {
         if (isEnabled(level, null, message, t)) {
             log(null, FQCN, level, messageFactory.newMessage(message), t);
@@ -1321,6 +1410,7 @@ public abstract class AbstractLogger imp
      * @param level the logging level
      * @param message the message object to log.
      */
+    @Override
     public void log(final Level level, final String message) {
         if (isEnabled(level, null, message)) {
             log(null, FQCN, level, messageFactory.newMessage(message), null);
@@ -1334,6 +1424,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param params parameters to the message.
      */
+    @Override
     public void log(final Level level, final String message, final Object... params) {
         if (isEnabled(level, null, message, params)) {
             final Message msg = messageFactory.newMessage(message, params);
@@ -1350,6 +1441,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param t the exception to log, including its stack trace.
      */
+    @Override
     public void log(final Level level, final String message, final Throwable t) {
         if (isEnabled(level, null, message, t)) {
             log(null, FQCN, level, messageFactory.newMessage(message), t);
@@ -1375,6 +1467,7 @@ public abstract class AbstractLogger imp
      * @param t     The Throwable.
      * @return the Throwable.
      */
+    @Override
     public <T extends Throwable> T throwing(final Level level, final T t) {
         return throwing(FQCN, level, t);
     }
@@ -1386,6 +1479,7 @@ public abstract class AbstractLogger imp
      * @param t The Throwable.
      * @return the Throwable.
      */
+    @Override
     public <T extends Throwable> T throwing(final T t) {
         return throwing(FQCN, Level.ERROR, t);
     }
@@ -1428,6 +1522,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement.
      * @param msg    the message string to be logged
      */
+    @Override
     public void trace(final Marker marker, final Message msg) {
         if (isEnabled(Level.TRACE, marker, msg, null)) {
             log(marker, FQCN, Level.TRACE, msg, null);
@@ -1442,6 +1537,7 @@ public abstract class AbstractLogger imp
      * @param msg    the message string to be logged
      * @param t      A Throwable or null.
      */
+    @Override
     public void trace(final Marker marker, final Message msg, final Throwable t) {
         if (isEnabled(Level.TRACE, marker, msg, t)) {
             log(marker, FQCN, Level.TRACE, msg, t);
@@ -1454,6 +1550,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement.
      * @param message the message object to log.
      */
+    @Override
     public void trace(final Marker marker, final Object message) {
         if (isEnabled(Level.TRACE, marker, message, null)) {
             log(marker, FQCN, Level.TRACE, messageFactory.newMessage(message), null);
@@ -1472,6 +1569,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void trace(final Marker marker, final Object message, final Throwable t) {
         if (isEnabled(Level.TRACE, marker, message, t)) {
             log(marker, FQCN, Level.TRACE, messageFactory.newMessage(message), t);
@@ -1484,6 +1582,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement.
      * @param message the message object to log.
      */
+    @Override
     public void trace(final Marker marker, final String message) {
         if (isEnabled(Level.TRACE, marker, message)) {
             log(marker, FQCN, Level.TRACE, messageFactory.newMessage(message), null);
@@ -1497,6 +1596,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param params  parameters to the message.
      */
+    @Override
     public void trace(final Marker marker, final String message, final Object... params) {
         if (isEnabled(Level.TRACE, marker, message, params)) {
             final Message msg = messageFactory.newMessage(message, params);
@@ -1516,6 +1616,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void trace(final Marker marker, final String message, final Throwable t) {
         if (isEnabled(Level.TRACE, marker, message, t)) {
             log(marker, FQCN, Level.TRACE, messageFactory.newMessage(message), t);
@@ -1527,6 +1628,7 @@ public abstract class AbstractLogger imp
      *
      * @param msg the message string to be logged
      */
+    @Override
     public void trace(final Message msg) {
         if (isEnabled(Level.TRACE, null, msg, null)) {
             log(null, FQCN, Level.TRACE, msg, null);
@@ -1539,6 +1641,7 @@ public abstract class AbstractLogger imp
      * @param msg the message string to be logged
      * @param t   A Throwable or null.
      */
+    @Override
     public void trace(final Message msg, final Throwable t) {
         if (isEnabled(Level.TRACE, null, msg, t)) {
             log(null, FQCN, Level.TRACE, msg, t);
@@ -1550,6 +1653,7 @@ public abstract class AbstractLogger imp
      *
      * @param message the message object to log.
      */
+    @Override
     public void trace(final Object message) {
         if (isEnabled(Level.TRACE, null, message, null)) {
             log(null, FQCN, Level.TRACE, messageFactory.newMessage(message), null);
@@ -1567,6 +1671,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void trace(final Object message, final Throwable t) {
         if (isEnabled(Level.TRACE, null, message, t)) {
             log(null, FQCN, Level.TRACE, messageFactory.newMessage(message), t);
@@ -1578,6 +1683,7 @@ public abstract class AbstractLogger imp
      *
      * @param message the message object to log.
      */
+    @Override
     public void trace(final String message) {
         if (isEnabled(Level.TRACE, null, message)) {
             log(null, FQCN, Level.TRACE, messageFactory.newMessage(message), null);
@@ -1590,6 +1696,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param params  parameters to the message.
      */
+    @Override
     public void trace(final String message, final Object... params) {
         if (isEnabled(Level.TRACE, null, message, params)) {
             final Message msg = messageFactory.newMessage(message, params);
@@ -1608,6 +1715,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void trace(final String message, final Throwable t) {
         if (isEnabled(Level.TRACE, null, message, t)) {
             log(null, FQCN, Level.TRACE, messageFactory.newMessage(message), t);
@@ -1620,6 +1728,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement
      * @param msg    the message string to be logged
      */
+    @Override
     public void warn(final Marker marker, final Message msg) {
         if (isEnabled(Level.WARN, marker, msg, null)) {
             log(marker, FQCN, Level.WARN, msg, null);
@@ -1633,6 +1742,7 @@ public abstract class AbstractLogger imp
      * @param msg    the message string to be logged
      * @param t      A Throwable or null.
      */
+    @Override
     public void warn(final Marker marker, final Message msg, final Throwable t) {
         if (isEnabled(Level.WARN, marker, msg, t)) {
             log(marker, FQCN, Level.WARN, msg, t);
@@ -1645,6 +1755,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement.
      * @param message the message object to log.
      */
+    @Override
     public void warn(final Marker marker, final Object message) {
         if (isEnabled(Level.WARN, marker, message, null)) {
             log(marker, FQCN, Level.WARN, messageFactory.newMessage(message), null);
@@ -1665,6 +1776,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void warn(final Marker marker, final Object message, final Throwable t) {
         if (isEnabled(Level.WARN, marker, message, t)) {
             log(marker, FQCN, Level.WARN, messageFactory.newMessage(message), t);
@@ -1677,6 +1789,7 @@ public abstract class AbstractLogger imp
      * @param marker the marker data specific to this log statement.
      * @param message the message object to log.
      */
+    @Override
     public void warn(final Marker marker, final String message) {
         if (isEnabled(Level.WARN, marker, message)) {
             log(marker, FQCN, Level.WARN, messageFactory.newMessage(message), null);
@@ -1690,6 +1803,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param params  parameters to the message.
      */
+    @Override
     public void warn(final Marker marker, final String message, final Object... params) {
         if (isEnabled(Level.WARN, marker, message, params)) {
             final Message msg = messageFactory.newMessage(message, params);
@@ -1705,6 +1819,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void warn(final Marker marker, final String message, final Throwable t) {
         if (isEnabled(Level.WARN, marker, message, t)) {
             log(marker, FQCN, Level.WARN, messageFactory.newMessage(message), t);
@@ -1716,6 +1831,7 @@ public abstract class AbstractLogger imp
      *
      * @param msg the message string to be logged
      */
+    @Override
     public void warn(final Message msg) {
         if (isEnabled(Level.WARN, null, msg, null)) {
             log(null, FQCN, Level.WARN, msg, null);
@@ -1728,6 +1844,7 @@ public abstract class AbstractLogger imp
      * @param msg the message string to be logged
      * @param t   A Throwable or null.
      */
+    @Override
     public void warn(final Message msg, final Throwable t) {
         if (isEnabled(Level.WARN, null, msg, t)) {
             log(null, FQCN, Level.WARN, msg, t);
@@ -1739,6 +1856,7 @@ public abstract class AbstractLogger imp
      *
      * @param message the message object to log.
      */
+    @Override
     public void warn(final Object message) {
         if (isEnabled(Level.WARN, null, message, null)) {
             log(null, FQCN, Level.WARN, messageFactory.newMessage(message), null);
@@ -1752,6 +1870,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void warn(final Object message, final Throwable t) {
         if (isEnabled(Level.WARN, null, message, t)) {
             log(null, FQCN, Level.WARN, messageFactory.newMessage(message), t);
@@ -1763,6 +1882,7 @@ public abstract class AbstractLogger imp
      *
      * @param message the message object to log.
      */
+    @Override
     public void warn(final String message) {
         if (isEnabled(Level.WARN, null, message)) {
             log(null, FQCN, Level.WARN, messageFactory.newMessage(message), null);
@@ -1775,6 +1895,7 @@ public abstract class AbstractLogger imp
      * @param message the message to log.
      * @param params  parameters to the message.
      */
+    @Override
     public void warn(final String message, final Object... params) {
         if (isEnabled(Level.WARN, null, message, params)) {
             final Message msg = messageFactory.newMessage(message, params);
@@ -1789,6 +1910,7 @@ public abstract class AbstractLogger imp
      * @param message the message object to log.
      * @param t       the exception to log, including its stack trace.
      */
+    @Override
     public void warn(final String message, final Throwable t) {
         if (isEnabled(Level.WARN, null, message, t)) {
             log(null, FQCN, Level.WARN, messageFactory.newMessage(message), t);

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java Thu May  9 15:35:35 2013
@@ -48,6 +48,7 @@ public class DefaultThreadContextMap imp
      * @param key The key name.
      * @param value The key value.
      */
+    @Override
     public void put(final String key, final String value) {
         if (!useMap) {
             return;
@@ -67,6 +68,7 @@ public class DefaultThreadContextMap imp
      * @param key The key to locate.
      * @return The value associated with the key or null.
      */
+    @Override
     public String get(final String key) {
         final Map<String, String> map = localMap.get();
         return map == null ? null : map.get(key);
@@ -77,6 +79,7 @@ public class DefaultThreadContextMap imp
      * parameter.
      * @param key The key to remove.
      */
+    @Override
     public void remove(final String key) {
         final Map<String, String> map = localMap.get();
         if (map != null) {
@@ -87,6 +90,7 @@ public class DefaultThreadContextMap imp
     /**
      * Clear the context.
      */
+    @Override
     public void clear() {
         localMap.remove();
     }
@@ -96,6 +100,7 @@ public class DefaultThreadContextMap imp
      * @param key The key to locate.
      * @return True if the key is in the context, false otherwise.
      */
+    @Override
     public boolean containsKey(final String key) {
         final Map<String, String> map = localMap.get();
         return map == null ? false : map.containsKey(key);
@@ -105,6 +110,7 @@ public class DefaultThreadContextMap imp
      * Get a copy of current thread's context Map.
      * @return a copy of the context.
      */
+    @Override
     public Map<String, String> getContext() {
         final Map<String, String> map = localMap.get();
         return map == null ? new HashMap<String, String>() : new HashMap<String, String>(map);
@@ -114,6 +120,7 @@ public class DefaultThreadContextMap imp
      * Return the context Map.
      * @return the Context Map.
      */
+    @Override
     public Map<String, String> get() {
         return localMap.get();
     }
@@ -122,6 +129,7 @@ public class DefaultThreadContextMap imp
      * Returns true if the Map is empty.
      * @return true if the Map is empty, false otherwise.
      */
+    @Override
     public boolean isEmpty() {
         final Map<String, String> map = localMap.get();
         return map == null || map.size() == 0;

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=1480696&r1=1480695&r2=1480696&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 May  9 15:35:35 2013
@@ -78,6 +78,7 @@ public class StatusConsoleListener imple
      * Writes status messages to the console.
      * @param data The StatusData.
      */
+    @Override
     public void log(final StatusData data) {
         if (data.getLevel().isAtLeastAsSpecificAs(level) && !filtered(data)) {
             stream.println(data.getFormattedStatus());

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java Thu May  9 15:35:35 2013
@@ -88,6 +88,7 @@ public final class ProviderUtil {
         } else {
             cl = java.security.AccessController.doPrivileged(
                 new java.security.PrivilegedAction<ClassLoader>() {
+                    @Override
                     public ClassLoader run() {
                         return Thread.currentThread().getContextClassLoader();
                     }

Modified: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/TestLoggerContext.java Thu May  9 15:35:35 2013
@@ -25,18 +25,22 @@ import org.apache.logging.log4j.spi.Logg
 public class TestLoggerContext implements LoggerContext {
     private final Logger logger = new TestLogger();
 
+    @Override
     public Logger getLogger(final String name) {
         return logger;
     }
 
+    @Override
     public Logger getLogger(final String name, final MessageFactory messageFactory) {
         return new TestLogger(name, messageFactory);
     }
 
+    @Override
     public boolean hasLogger(final String name) {
         return false;
     }
 
+    @Override
     public Object getExternalContext() {
         return null;
     }

Modified: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/TestLoggerContextFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/TestLoggerContextFactory.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/TestLoggerContextFactory.java (original)
+++ logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/TestLoggerContextFactory.java Thu May  9 15:35:35 2013
@@ -28,10 +28,12 @@ public class TestLoggerContextFactory im
 
     private static LoggerContext context = new TestLoggerContext();
 
+    @Override
     public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext) {
         return context;
     }
 
+    @Override
     public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext,
                                     URI configLocation) {
         return context;

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java Thu May  9 15:35:35 2013
@@ -77,6 +77,7 @@ public final class FlumeAppender<T exten
      * Publish the event.
      * @param event The LogEvent.
      */
+    @Override
     public void append(final LogEvent event) {
 
         final FlumeEvent flumeEvent = factory.createEvent(event, mdcIncludes, mdcExcludes, mdcRequired, mdcPrefix,
@@ -102,6 +103,7 @@ public final class FlumeAppender<T exten
      * @param compress If true the body will be compressed.
      * @return A Flume Event.
      */
+    @Override
     public FlumeEvent createEvent(final LogEvent event, final String includes, final String excludes,
                                   final String required, final String mdcPrefix, final String eventPrefix,
                                   final boolean compress) {

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java Thu May  9 15:35:35 2013
@@ -262,6 +262,7 @@ public class FlumeAvroManager extends Ab
          * @param data The data required to create the entity.
          * @return The FlumeAvroManager.
          */
+        @Override
         public FlumeAvroManager createManager(final String name, final FactoryData data) {
             try {
 

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java Thu May  9 15:35:35 2013
@@ -168,6 +168,7 @@ public class FlumeEmbeddedManager extend
          * @param data The data required to create the entity.
          * @return The FlumeAvroManager.
          */
+        @Override
         public FlumeEmbeddedManager createManager(final String name, final FactoryData data) {
             try {
                 final DefaultLogicalNodeManager nodeManager = new DefaultLogicalNodeManager();

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java?rev=1480696&r1=1480695&r2=1480696&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java Thu May  9 15:35:35 2013
@@ -190,6 +190,7 @@ public class FlumeEvent extends SimpleEv
      * Get the Frequently Qualified Class Name.
      * @return the FQCN String.
      */
+    @Override
     public String getFQCN() {
         return event.getFQCN();
     }
@@ -198,6 +199,7 @@ public class FlumeEvent extends SimpleEv
      * Returns the logging Level.
      * @return the Level.
      */
+    @Override
     public Level getLevel() {
         return event.getLevel();
     }
@@ -206,6 +208,7 @@ public class FlumeEvent extends SimpleEv
      * Returns the logger name.
      * @return the logger name.
      */
+    @Override
     public String getLoggerName() {
         return event.getLoggerName();
     }
@@ -214,6 +217,7 @@ public class FlumeEvent extends SimpleEv
      * Returns the StackTraceElement for the caller of the logging API.
      * @return the StackTraceElement of the caller.
      */
+    @Override
     public StackTraceElement getSource() {
         return event.getSource();
     }
@@ -222,6 +226,7 @@ public class FlumeEvent extends SimpleEv
      * Returns the Message.
      * @return the Message.
      */
+    @Override
     public Message getMessage() {
         return event.getMessage();
     }
@@ -230,6 +235,7 @@ public class FlumeEvent extends SimpleEv
      * Returns the Marker.
      * @return the Marker.
      */
+    @Override
     public Marker getMarker() {
         return event.getMarker();
     }
@@ -238,6 +244,7 @@ public class FlumeEvent extends SimpleEv
      * Returns the name of the Thread.
      * @return the name of the Thread.
      */
+    @Override
     public String getThreadName() {
         return event.getThreadName();
     }
@@ -246,6 +253,7 @@ public class FlumeEvent extends SimpleEv
      * Returns the event timestamp.
      * @return the event timestamp.
      */
+    @Override
     public long getMillis() {
         return event.getMillis();
     }
@@ -254,6 +262,7 @@ public class FlumeEvent extends SimpleEv
      * Returns the Throwable associated with the event, if any.
      * @return the Throwable.
      */
+    @Override
     public Throwable getThrown() {
         return event.getThrown();
     }
@@ -262,6 +271,7 @@ public class FlumeEvent extends SimpleEv
      * Returns a copy of the context Map.
      * @return a copy of the context Map.
      */
+    @Override
     public Map<String, String> getContextMap() {
         return ctx;
     }
@@ -270,6 +280,7 @@ public class FlumeEvent extends SimpleEv
      * Returns a copy of the context stack.
      * @return a copy of the context stack.
      */
+    @Override
     public ThreadContext.ContextStack getContextStack() {
         return event.getContextStack();
     }



Mime
View raw message