logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1431427 - in /logging/log4j/log4j2/trunk: api/src/main/java/org/apache/logging/log4j/message/ core/src/main/java/org/apache/logging/log4j/core/net/ core/src/test/java/org/apache/logging/dumbster/smtp/ log4j12-api/src/main/java/org/apache/l...
Date Thu, 10 Jan 2013 15:30:02 GMT
Author: ggregory
Date: Thu Jan 10 15:30:01 2013
New Revision: 1431427

URL: http://svn.apache.org/viewvc?rev=1431427&view=rev
Log:
Add missing '@Override' annotations.
Add missing '@Deprecated' annotations.

Modified:
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpActionType.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpState.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Category.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/LogManager.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetterException.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/Filter.java

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java?rev=1431427&r1=1431426&r2=1431427&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java
(original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/FormattedMessageFactory.java
Thu Jan 10 15:30:01 2013
@@ -29,6 +29,7 @@ public class FormattedMessageFactory ext
      *
      * @see MessageFactory#newMessage(String, Object...)
      */
+    @Override
     public Message newMessage(String message, Object... params) {
         return new FormattedMessage(message, params);
     }

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java?rev=1431427&r1=1431426&r2=1431427&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java
(original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java
Thu Jan 10 15:30:01 2013
@@ -46,6 +46,7 @@ public class LocalizedMessageFactory ext
      *
      * @see org.apache.logging.log4j.message.MessageFactory#newMessage(String, Object...)
      */
+    @Override
     public Message newMessage(String message, Object... params) {
         if (bundle == null) {
             return new LocalizedMessage(bundleId,  message, params);

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java?rev=1431427&r1=1431426&r2=1431427&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java
(original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFormatMessageFactory.java
Thu Jan 10 15:30:01 2013
@@ -29,6 +29,7 @@ public class MessageFormatMessageFactory
      *
      * @see org.apache.logging.log4j.message.MessageFactory#newMessage(String, Object...)
      */
+    @Override
     public Message newMessage(String message, Object... params) {
         return new MessageFormatMessage(message, params);
     }

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java?rev=1431427&r1=1431426&r2=1431427&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java
(original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessageFactory.java
Thu Jan 10 15:30:01 2013
@@ -39,6 +39,7 @@ public final class ParameterizedMessageF
      * 
      * @see MessageFactory#newMessage(String, Object...)
      */
+    @Override
     public Message newMessage(final String message, final Object... params) {
         return new ParameterizedMessage(message, params);
     }

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java?rev=1431427&r1=1431426&r2=1431427&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java
(original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StringFormatterMessageFactory.java
Thu Jan 10 15:30:01 2013
@@ -41,6 +41,7 @@ public final class StringFormatterMessag
      * 
      * @see MessageFactory#newMessage(String, Object...)
      */
+    @Override
     public Message newMessage(final String message, final Object... params) {
         return new StringFormattedMessage(message, params);
     }

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java?rev=1431427&r1=1431426&r2=1431427&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java
Thu Jan 10 15:30:01 2013
@@ -320,6 +320,7 @@ public class SMTPManager extends Abstrac
                 return new Authenticator() {
                     private final PasswordAuthentication passwordAuthentication = new PasswordAuthentication(username,
password);
 
+                    @Override
                     protected PasswordAuthentication getPasswordAuthentication() {
                         return passwordAuthentication;
                     }

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpActionType.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpActionType.java?rev=1431427&r1=1431426&r2=1431427&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpActionType.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpActionType.java
Thu Jan 10 15:30:01 2013
@@ -164,6 +164,7 @@ public class SmtpActionType {
      *
      * @return a String
      */
+    @Override
     public String toString() {
         switch (value) {
             case CONNECT_BYTE:

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java?rev=1431427&r1=1431426&r2=1431427&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java
Thu Jan 10 15:30:01 2013
@@ -135,6 +135,7 @@ public class SmtpMessage {
      *
      * @return a String
      */
+    @Override
     public String toString() {
         StringBuffer msg = new StringBuffer();
         for (Iterator i = headers.keySet().iterator(); i.hasNext(); ) {

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpState.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpState.java?rev=1431427&r1=1431426&r2=1431427&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpState.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SmtpState.java
Thu Jan 10 15:30:01 2013
@@ -97,6 +97,7 @@ public class SmtpState {
      *
      * @return a String
      */
+    @Override
     public String toString() {
         switch (value) {
             case CONNECT_BYTE:

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Category.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Category.java?rev=1431427&r1=1431426&r2=1431427&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Category.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Category.java Thu
Jan 10 15:30:01 2013
@@ -147,6 +147,7 @@ public class Category {
 
      @deprecated Please use {@link LogManager#getCurrentLoggers()} instead.
      */
+    @Deprecated
     public static Enumeration getCurrentCategories() {
         return LogManager.getCurrentLoggers();
     }

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/LogManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/LogManager.java?rev=1431427&r1=1431426&r2=1431427&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/LogManager.java
(original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/LogManager.java
Thu Jan 10 15:30:01 2013
@@ -34,6 +34,7 @@ public final class LogManager {
      * @deprecated This variable is for internal use only. It will
      * become package protected in future versions.
      * */
+    @Deprecated
     public static final String DEFAULT_CONFIGURATION_FILE = "log4j.properties";
 
     static final String DEFAULT_XML_CONFIGURATION_FILE = "log4j.xml";
@@ -42,18 +43,21 @@ public final class LogManager {
      * @deprecated This variable is for internal use only. It will
      * become private in future versions.
      * */
+    @Deprecated
     public static final String DEFAULT_CONFIGURATION_KEY="log4j.configuration";
 
     /**
      * @deprecated This variable is for internal use only. It will
      * become private in future versions.
      * */
+    @Deprecated
     public static final String CONFIGURATOR_CLASS_KEY="log4j.configuratorClass";
 
     /**
      * @deprecated This variable is for internal use only. It will
      * become private in future versions.
      */
+    @Deprecated
     public static final String DEFAULT_INIT_OVERRIDE_KEY = "log4j.defaultInitOverride";
 
     private static final LoggerRepository REPOSITORY = new Repository();

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetterException.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetterException.java?rev=1431427&r1=1431426&r2=1431427&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetterException.java
(original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetterException.java
Thu Jan 10 15:30:01 2013
@@ -38,6 +38,7 @@ public class PropertySetterException ext
     /**
      * Returns descriptive text on the cause of this exception.
      */
+    @Override
     public String getMessage() {
         String msg = super.getMessage();
         if (msg == null && rootCause != null) {

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/Filter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/Filter.java?rev=1431427&r1=1431426&r2=1431427&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/Filter.java
(original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/Filter.java
Thu Jan 10 15:30:01 2013
@@ -26,6 +26,7 @@ public abstract class Filter {
      *
      * @deprecated As of 1.2.12, use {@link #getNext} and {@link #setNext} instead
      */
+    @Deprecated
     public Filter next;
 
     /**



Mime
View raw message