Author: ggregory Date: Fri Sep 28 21:54:56 2012 New Revision: 1391670 URL: http://svn.apache.org/viewvc?rev=1391670&view=rev Log: Add missing '@Override' annotations.
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/MapMessage.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/StructuredDataId.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/Timer.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=1391670&r1=1391669&r2=1391670&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 Fri Sep 28 21:54:56 2012 @@ -146,6 +146,7 @@ public final class MarkerManager { return name != null ? name.hashCode() : 0; } + @Override public String toString() { StringBuilder sb = new StringBuilder(name); if (parent != null) { 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=1391670&r1=1391669&r2=1391670&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 Fri Sep 28 21:54:56 2012 @@ -46,6 +46,7 @@ public final class ThreadContext { private static ThreadLocal<Map<String, String>> localMap = new InheritableThreadLocal<Map<String, String>>() { + @Override protected Map<String, String> childValue(Map<String, String> parentValue) { return parentValue == null ? null : new HashMap<String, String>(parentValue); } 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=1391670&r1=1391669&r2=1391670&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 Fri Sep 28 21:54:56 2012 @@ -277,10 +277,12 @@ public class MapMessage implements Multi return new MapMessage(map); } + @Override public String toString() { return asString(); } + @Override public boolean equals(Object o) { if (this == o) { return true; @@ -294,6 +296,7 @@ public class MapMessage implements Multi return this.data.equals(that.data); } + @Override public int hashCode() { return data.hashCode(); } 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=1391670&r1=1391669&r2=1391670&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 Fri Sep 28 21:54:56 2012 @@ -65,6 +65,7 @@ public class ObjectMessage implements Me return new Object[]{obj}; } + @Override public boolean equals(Object o) { if (this == o) { return true; @@ -78,10 +79,12 @@ public class ObjectMessage implements Me return !(obj != null ? !obj.equals(that.obj) : that.obj != null); } + @Override public int hashCode() { return obj != null ? obj.hashCode() : 0; } + @Override public String toString() { return "ObjectMessage[obj=" + obj.toString() + "]"; } 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=1391670&r1=1391669&r2=1391670&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 Fri Sep 28 21:54:56 2012 @@ -250,6 +250,7 @@ public class ParameterizedMessage implem return format(msgPattern, sArgs); } + @Override public boolean equals(Object o) { if (this == o) { return true; @@ -271,6 +272,7 @@ public class ParameterizedMessage implem return true; } + @Override public int hashCode() { int result = messagePattern != null ? messagePattern.hashCode() : 0; result = HASHVAL * result + (stringArgs != null ? Arrays.hashCode(stringArgs) : 0); @@ -575,6 +577,7 @@ public class ParameterizedMessage implem return obj.getClass().getName() + "@" + Integer.toHexString(System.identityHashCode(obj)); } + @Override public String toString() { return "ParameterizedMessage[messagePattern=" + messagePattern + ", stringArgs=" + Arrays.toString(stringArgs) + ", throwable=" + 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=1391670&r1=1391669&r2=1391670&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 Fri Sep 28 21:54:56 2012 @@ -65,6 +65,7 @@ public class SimpleMessage implements Me return null; } + @Override public boolean equals(Object o) { if (this == o) { return true; @@ -78,10 +79,12 @@ public class SimpleMessage implements Me return !(message != null ? !message.equals(that.message) : that.message != null); } + @Override public int hashCode() { return message != null ? message.hashCode() : 0; } + @Override public String toString() { return "SimpleMessage[message=" + message + "]"; } 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=1391670&r1=1391669&r2=1391670&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 Fri Sep 28 21:54:56 2012 @@ -112,6 +112,7 @@ public class StringFormattedMessage impl } } + @Override public boolean equals(Object o) { if (this == o) { return true; @@ -132,6 +133,7 @@ public class StringFormattedMessage impl return true; } + @Override public int hashCode() { int result = messagePattern != null ? messagePattern.hashCode() : 0; result = HASHVAL * result + (stringArgs != null ? Arrays.hashCode(stringArgs) : 0); @@ -139,6 +141,7 @@ public class StringFormattedMessage impl } + @Override public String toString() { return "StringFormatMessage[messagePattern=" + messagePattern + ", args=" + Arrays.toString(argArray) + "]"; Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java?rev=1391670&r1=1391669&r2=1391670&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java Fri Sep 28 21:54:56 2012 @@ -179,6 +179,7 @@ public class StructuredDataId implements return enterpriseNumber <= 0; } + @Override public String toString() { return isReserved() ? name : name + "@" + enterpriseNumber; } Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java?rev=1391670&r1=1391669&r2=1391670&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java Fri Sep 28 21:54:56 2012 @@ -122,6 +122,7 @@ public class StructuredDataMessage exten * Return the supported formats. * @return An array of the supported format names. */ + @Override public String[] getFormats() { String[] formats = new String[Format.values().length]; int i = 0; @@ -173,6 +174,7 @@ public class StructuredDataMessage exten * Return the message. * @return the message. */ + @Override public String getMessageFormat() { return message; } @@ -207,6 +209,7 @@ public class StructuredDataMessage exten * @return The formatted String. */ + @Override public String asString(String format) { try { return asString(Format.valueOf(format.toUpperCase()), null); @@ -311,10 +314,12 @@ public class StructuredDataMessage exten } + @Override public MapMessage newInstance(Map<String, String> map) { return new StructuredDataMessage(this, map); } + @Override public boolean equals(Object o) { if (this == o) { return true; @@ -341,6 +346,7 @@ public class StructuredDataMessage exten return true; } + @Override public int hashCode() { int result = super.hashCode(); result = HASHVAL * result + (type != null ? type.hashCode() : 0); Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java?rev=1391670&r1=1391669&r2=1391670&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java Fri Sep 28 21:54:56 2012 @@ -240,6 +240,7 @@ public final class StatusLogger extends this.size = size; } + @Override public boolean add(E object) { while (messages.size() > size) { messages.poll(); Modified: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/Timer.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/Timer.java?rev=1391670&r1=1391669&r2=1391670&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/Timer.java (original) +++ logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/Timer.java Fri Sep 28 21:54:56 2012 @@ -137,6 +137,7 @@ public class Timer implements Serializab /** * Return the String representation of the timer based upon its current state */ + @Override public String toString() { StringBuilder result = new StringBuilder("Timer ").append(m_name); @@ -226,6 +227,7 @@ public class Timer implements Serializab return result.toString(); } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof Timer)) return false; @@ -240,6 +242,7 @@ public class Timer implements Serializab return true; } + @Override public int hashCode() { int result; result = (m_name != null ? m_name.hashCode() : 0);