This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 012b47f26470745ce96dcdc49b75020a0c95d786 Author: Paul King <[email protected]> AuthorDate: Thu Oct 1 22:24:28 2020 +1000 add missing @Override annotations --- src/main/java/groovy/lang/Closure.java | 3 +++ src/main/java/groovy/lang/DelegatingMetaClass.java | 3 +++ src/main/java/groovy/lang/EmptyRange.java | 1 + src/main/java/groovy/lang/IntRange.java | 2 ++ src/main/java/groovy/lang/MetaClassImpl.java | 1 + src/main/java/groovy/lang/MetaMethod.java | 1 + src/main/java/groovy/lang/ObjectRange.java | 2 ++ src/main/java/groovy/lang/Sequence.java | 2 ++ src/main/java/groovy/lang/SpreadMap.java | 1 + src/main/java/groovy/namespace/QName.java | 3 +++ src/main/java/groovy/time/BaseDuration.java | 1 + src/main/java/groovy/util/Expando.java | 3 +++ src/main/java/groovy/util/MapEntry.java | 3 +++ src/main/java/groovy/util/Node.java | 1 + src/main/java/groovy/util/ObjectGraphBuilder.java | 1 + src/main/java/groovy/util/ObservableList.java | 2 ++ src/main/java/groovy/util/ObservableMap.java | 2 ++ src/main/java/org/codehaus/groovy/GroovyBugError.java | 1 + src/main/java/org/codehaus/groovy/ast/ClassNode.java | 3 +++ src/main/java/org/codehaus/groovy/ast/GenericsType.java | 1 + src/main/java/org/codehaus/groovy/ast/Parameter.java | 1 + .../org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/expr/ArrayExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/expr/BinaryExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/expr/ClassExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/expr/ClosureExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/expr/ConstantExpression.java | 1 + .../java/org/codehaus/groovy/ast/expr/ConstructorCallExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/expr/GStringExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/expr/ListExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/expr/MapEntryExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/expr/MapExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/expr/MethodCallExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/expr/PostfixExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/expr/PrefixExpression.java | 1 + .../java/org/codehaus/groovy/ast/expr/StaticMethodCallExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/expr/TernaryExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/expr/TupleExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/expr/VariableExpression.java | 1 + src/main/java/org/codehaus/groovy/ast/stmt/BlockStatement.java | 1 + src/main/java/org/codehaus/groovy/ast/stmt/CaseStatement.java | 1 + src/main/java/org/codehaus/groovy/ast/stmt/ExpressionStatement.java | 1 + src/main/java/org/codehaus/groovy/classgen/asm/BytecodeVariable.java | 1 + src/main/java/org/codehaus/groovy/classgen/asm/MopWriter.java | 2 ++ src/main/java/org/codehaus/groovy/classgen/asm/OperandStack.java | 1 + src/main/java/org/codehaus/groovy/reflection/CachedMethod.java | 3 +++ src/main/java/org/codehaus/groovy/reflection/MixinInMetaClass.java | 2 ++ src/main/java/org/codehaus/groovy/runtime/AbstractComparator.java | 1 + src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java | 3 +++ src/main/java/org/codehaus/groovy/runtime/EncodingGroovyMethods.java | 2 ++ src/main/java/org/codehaus/groovy/runtime/HandleMetaClass.java | 1 + src/main/java/org/codehaus/groovy/runtime/IOGroovyMethods.java | 1 + src/main/java/org/codehaus/groovy/runtime/MethodKey.java | 3 +++ src/main/java/org/codehaus/groovy/runtime/NullObject.java | 3 +++ src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java | 1 + .../org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java | 3 +++ .../java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java | 1 + .../java/org/codehaus/groovy/runtime/metaclass/OwnedMetaClass.java | 3 +++ .../org/codehaus/groovy/runtime/metaclass/ReflectionMetaMethod.java | 1 + src/main/java/org/codehaus/groovy/syntax/CSTNode.java | 1 + src/main/java/org/codehaus/groovy/syntax/ReadException.java | 1 + src/main/java/org/codehaus/groovy/tools/shell/IO.java | 1 + src/main/java/org/codehaus/groovy/util/FastArray.java | 1 + src/main/java/org/codehaus/groovy/util/LazyReference.java | 1 + .../java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java | 3 +++ .../groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java | 1 + .../src/main/java/org/codehaus/groovy/groovydoc/GroovyType.java | 1 + .../java/org/codehaus/groovy/tools/groovydoc/ArrayClassDocWrapper.java | 1 + .../main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java | 1 + .../main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java | 1 + subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java | 1 + subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java | 1 + subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java | 1 + .../src/main/java/org/apache/groovy/json/internal/CharBuf.java | 1 + .../main/java/org/apache/groovy/json/internal/CharSequenceValue.java | 3 +++ .../src/main/java/org/apache/groovy/json/internal/LazyValueMap.java | 1 + .../src/main/java/org/apache/groovy/json/internal/NumberValue.java | 3 +++ .../src/main/java/org/apache/groovy/json/internal/SimpleCache.java | 1 + .../src/main/java/org/apache/groovy/json/internal/ValueContainer.java | 1 + .../groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java | 1 + .../groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java | 1 + subprojects/groovy-sql/src/main/java/groovy/sql/GroovyRowResult.java | 3 +++ .../src/main/java/groovy/swing/model/DefaultTableColumn.java | 1 + .../src/main/groovy/groovy/text/SimpleTemplateEngine.java | 1 + .../src/main/groovy/groovy/text/StreamingTemplateEngine.java | 1 + .../src/main/groovy/groovy/text/XmlTemplateEngine.java | 2 ++ .../src/main/groovy/groovy/text/markup/BaseTemplate.java | 1 + .../src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java | 1 + .../src/main/java/org/apache/groovy/test/ScriptTestAdapter.java | 1 + subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java | 1 + .../src/main/java/groovy/xml/slurpersupport/GPathResult.java | 1 + 91 files changed, 132 insertions(+) diff --git a/src/main/java/groovy/lang/Closure.java b/src/main/java/groovy/lang/Closure.java index 1f55e01..536598d 100644 --- a/src/main/java/groovy/lang/Closure.java +++ b/src/main/java/groovy/lang/Closure.java @@ -1041,6 +1041,7 @@ public abstract class Closure<V> extends GroovyObjectSupport implements Cloneabl /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return Closure.this.hashCode(); } @@ -1048,6 +1049,7 @@ public abstract class Closure<V> extends GroovyObjectSupport implements Cloneabl /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object arg0) { return Closure.this.equals(arg0); } @@ -1055,6 +1057,7 @@ public abstract class Closure<V> extends GroovyObjectSupport implements Cloneabl /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { final Writer writer = new StringBuilderWriter(); diff --git a/src/main/java/groovy/lang/DelegatingMetaClass.java b/src/main/java/groovy/lang/DelegatingMetaClass.java index 82d8a29..1f38dd3 100644 --- a/src/main/java/groovy/lang/DelegatingMetaClass.java +++ b/src/main/java/groovy/lang/DelegatingMetaClass.java @@ -192,6 +192,7 @@ public class DelegatingMetaClass implements MetaClass, MutableMetaClass, GroovyO /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { return delegate.equals(obj); } @@ -199,10 +200,12 @@ public class DelegatingMetaClass implements MetaClass, MutableMetaClass, GroovyO /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return delegate.hashCode(); } + @Override public String toString() { return super.toString() + "[" + delegate.toString() + "]"; } diff --git a/src/main/java/groovy/lang/EmptyRange.java b/src/main/java/groovy/lang/EmptyRange.java index b67b32e..a6df966 100644 --- a/src/main/java/groovy/lang/EmptyRange.java +++ b/src/main/java/groovy/lang/EmptyRange.java @@ -91,6 +91,7 @@ public class EmptyRange<T extends Comparable> extends AbstractList<T> implements /** * {@inheritDoc} */ + @Override public String toString() { return (null == at) ? "null..<null" diff --git a/src/main/java/groovy/lang/IntRange.java b/src/main/java/groovy/lang/IntRange.java index 8a1a172..c1a4bc3 100644 --- a/src/main/java/groovy/lang/IntRange.java +++ b/src/main/java/groovy/lang/IntRange.java @@ -255,6 +255,7 @@ public class IntRange extends AbstractList<Integer> implements Range<Integer>, S * @param that the object to compare * @return <code>true</code> if the objects are equal */ + @Override public boolean equals(Object that) { return that instanceof IntRange ? equals((IntRange) that) : super.equals(that); } @@ -364,6 +365,7 @@ public class IntRange extends AbstractList<Integer> implements Range<Integer>, S return new IntRange(fromIndex + getFrom(), toIndex + getFrom() - 1, isReverse()); } + @Override public String toString() { return inclusive != null ? ("" + from + ".." + (inclusive ? "" : "<") + to) : (reverse ? "" + to + ".." + from : "" + from + ".." + to); diff --git a/src/main/java/groovy/lang/MetaClassImpl.java b/src/main/java/groovy/lang/MetaClassImpl.java index 1b99ad5..4723d59 100644 --- a/src/main/java/groovy/lang/MetaClassImpl.java +++ b/src/main/java/groovy/lang/MetaClassImpl.java @@ -3089,6 +3089,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass { /** * Returns a string representation of this metaclass */ + @Override public String toString() { return super.toString() + "[" + theClass + "]"; } diff --git a/src/main/java/groovy/lang/MetaMethod.java b/src/main/java/groovy/lang/MetaMethod.java index 50e6181..a098205 100644 --- a/src/main/java/groovy/lang/MetaMethod.java +++ b/src/main/java/groovy/lang/MetaMethod.java @@ -146,6 +146,7 @@ public abstract class MetaMethod extends ParameterTypes implements Cloneable { /** * Returns a string representation of this method */ + @Override public String toString() { return super.toString() + "[name: " diff --git a/src/main/java/groovy/lang/ObjectRange.java b/src/main/java/groovy/lang/ObjectRange.java index 19c585e..de42c17 100644 --- a/src/main/java/groovy/lang/ObjectRange.java +++ b/src/main/java/groovy/lang/ObjectRange.java @@ -202,6 +202,7 @@ public class ObjectRange extends AbstractList<Comparable> implements Range<Compa } } + @Override public boolean equals(Object that) { return (that instanceof ObjectRange) ? equals((ObjectRange) that) : super.equals(that); } @@ -363,6 +364,7 @@ public class ObjectRange extends AbstractList<Comparable> implements Range<Compa return new ObjectRange(fromValue, toValue, reverse); } + @Override public String toString() { return reverse ? "" + to + ".." + from : "" + from + ".." + to; } diff --git a/src/main/java/groovy/lang/Sequence.java b/src/main/java/groovy/lang/Sequence.java index 1409961..c5bca30 100644 --- a/src/main/java/groovy/lang/Sequence.java +++ b/src/main/java/groovy/lang/Sequence.java @@ -60,6 +60,7 @@ public class Sequence extends ArrayList implements GroovyObject { addAll(collection); } + @Override public boolean equals(Object that) { if (that instanceof Sequence) { return equals((Sequence) that); @@ -79,6 +80,7 @@ public class Sequence extends ArrayList implements GroovyObject { return false; } + @Override public int hashCode() { if (hashCode == 0) { for (int i = 0; i < size(); i++) { diff --git a/src/main/java/groovy/lang/SpreadMap.java b/src/main/java/groovy/lang/SpreadMap.java index 4e00cb5..6fa397c 100644 --- a/src/main/java/groovy/lang/SpreadMap.java +++ b/src/main/java/groovy/lang/SpreadMap.java @@ -107,6 +107,7 @@ public class SpreadMap extends HashMap { /** * @return the string expression of <code>this</code> */ + @Override public String toString() { if (isEmpty()) { return "*:[:]"; diff --git a/src/main/java/groovy/namespace/QName.java b/src/main/java/groovy/namespace/QName.java index e029fc5..a7d7ed2 100644 --- a/src/main/java/groovy/namespace/QName.java +++ b/src/main/java/groovy/namespace/QName.java @@ -130,6 +130,7 @@ public class QName implements Serializable { * * @return a string representation of the QName */ + @Override public String toString() { return ((namespaceURI.equals(EMPTY_STRING)) ? localPart @@ -167,6 +168,7 @@ public class QName implements Serializable { * @return <code>true</code> if the given object is identical to this * QName: <code>false</code> otherwise. */ + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null) return false; @@ -278,6 +280,7 @@ public class QName implements Serializable { * * @return a hash code value for this Qname object */ + @Override public int hashCode() { int result; result = namespaceURI.hashCode(); diff --git a/src/main/java/groovy/time/BaseDuration.java b/src/main/java/groovy/time/BaseDuration.java index 7e1f1b9..9904434 100644 --- a/src/main/java/groovy/time/BaseDuration.java +++ b/src/main/java/groovy/time/BaseDuration.java @@ -97,6 +97,7 @@ public abstract class BaseDuration implements Comparable<BaseDuration> { return cal.getTime(); } + @Override public String toString() { List buffer = new ArrayList(); diff --git a/src/main/java/groovy/util/Expando.java b/src/main/java/groovy/util/Expando.java index 3ed5a86..d95b590 100644 --- a/src/main/java/groovy/util/Expando.java +++ b/src/main/java/groovy/util/Expando.java @@ -112,6 +112,7 @@ public class Expando extends GroovyObjectSupport { * * @see java.lang.Object#toString() */ + @Override public String toString() { Object method = getProperties().get("toString"); if (method instanceof Closure) { @@ -130,6 +131,7 @@ public class Expando extends GroovyObjectSupport { * * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { Object method = getProperties().get("equals"); if (method instanceof Closure) { @@ -149,6 +151,7 @@ public class Expando extends GroovyObjectSupport { * * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { Object method = getProperties().get("hashCode"); if (method instanceof Closure) { diff --git a/src/main/java/groovy/util/MapEntry.java b/src/main/java/groovy/util/MapEntry.java index 4973c49..995e2a8 100644 --- a/src/main/java/groovy/util/MapEntry.java +++ b/src/main/java/groovy/util/MapEntry.java @@ -35,6 +35,7 @@ public class MapEntry implements Map.Entry { this.value = value; } + @Override public boolean equals(Object that) { if (that instanceof MapEntry) { return equals((MapEntry) that); @@ -46,10 +47,12 @@ public class MapEntry implements Map.Entry { return DefaultTypeTransformation.compareEqual(this.key, that.key) && DefaultTypeTransformation.compareEqual(this.value, that.value); } + @Override public int hashCode() { return hash(key) ^ hash(value); } + @Override public String toString() { return "" + key + ":" + value; } diff --git a/src/main/java/groovy/util/Node.java b/src/main/java/groovy/util/Node.java index 5576d57..88ae680 100644 --- a/src/main/java/groovy/util/Node.java +++ b/src/main/java/groovy/util/Node.java @@ -772,6 +772,7 @@ public class Node implements Serializable, Cloneable { return answer; } + @Override public String toString() { return name + "[attributes=" + attributes + "; value=" + value + "]"; } diff --git a/src/main/java/groovy/util/ObjectGraphBuilder.java b/src/main/java/groovy/util/ObjectGraphBuilder.java index c09e565..ab65eca 100644 --- a/src/main/java/groovy/util/ObjectGraphBuilder.java +++ b/src/main/java/groovy/util/ObjectGraphBuilder.java @@ -841,6 +841,7 @@ public class ObjectGraphBuilder extends FactoryBuilderSupport { this.refId = refId; } + @Override public String toString() { return "[parentName=" + parentName + ", childName=" + childName + diff --git a/src/main/java/groovy/util/ObservableList.java b/src/main/java/groovy/util/ObservableList.java index ecadfd1..e710c65 100644 --- a/src/main/java/groovy/util/ObservableList.java +++ b/src/main/java/groovy/util/ObservableList.java @@ -216,6 +216,7 @@ public class ObservableList implements List { return delegate.containsAll(c); } + @Override public boolean equals(Object o) { return delegate.equals(o); } @@ -225,6 +226,7 @@ public class ObservableList implements List { return delegate.get(index); } + @Override public int hashCode() { return delegate.hashCode(); } diff --git a/src/main/java/groovy/util/ObservableMap.java b/src/main/java/groovy/util/ObservableMap.java index 3dc0672..2d5780a 100644 --- a/src/main/java/groovy/util/ObservableMap.java +++ b/src/main/java/groovy/util/ObservableMap.java @@ -161,6 +161,7 @@ public class ObservableMap implements Map { return delegate.entrySet(); } + @Override public boolean equals(Object o) { return delegate.equals(o); } @@ -170,6 +171,7 @@ public class ObservableMap implements Map { return delegate.get(key); } + @Override public int hashCode() { return delegate.hashCode(); } diff --git a/src/main/java/org/codehaus/groovy/GroovyBugError.java b/src/main/java/org/codehaus/groovy/GroovyBugError.java index c1bee14..58cf8e6 100644 --- a/src/main/java/org/codehaus/groovy/GroovyBugError.java +++ b/src/main/java/org/codehaus/groovy/GroovyBugError.java @@ -66,6 +66,7 @@ public class GroovyBugError extends AssertionError { * * @see #getMessage() */ + @Override public String toString() { return getMessage(); } diff --git a/src/main/java/org/codehaus/groovy/ast/ClassNode.java b/src/main/java/org/codehaus/groovy/ast/ClassNode.java index b84b8d6..49d2524 100644 --- a/src/main/java/org/codehaus/groovy/ast/ClassNode.java +++ b/src/main/java/org/codehaus/groovy/ast/ClassNode.java @@ -685,6 +685,7 @@ public class ClassNode extends AnnotatedNode { } } + @Override public boolean equals(Object that) { if (that == this) return true; if (!(that instanceof ClassNode)) return false; @@ -692,6 +693,7 @@ public class ClassNode extends AnnotatedNode { return (((ClassNode) that).getText().equals(getText())); } + @Override public int hashCode() { return (redirect != null ? redirect.hashCode() : getText().hashCode()); } @@ -1201,6 +1203,7 @@ public class ClassNode extends AnnotatedNode { redirect().script = script; } + @Override public String toString() { return toString(true); } diff --git a/src/main/java/org/codehaus/groovy/ast/GenericsType.java b/src/main/java/org/codehaus/groovy/ast/GenericsType.java index 84f28f7..ed569df 100644 --- a/src/main/java/org/codehaus/groovy/ast/GenericsType.java +++ b/src/main/java/org/codehaus/groovy/ast/GenericsType.java @@ -61,6 +61,7 @@ public class GenericsType extends ASTNode { this.type = Objects.requireNonNull(type); // TODO: ensure type is not primitive } + @Override public String toString() { return toString(this, new HashSet<>()); } diff --git a/src/main/java/org/codehaus/groovy/ast/Parameter.java b/src/main/java/org/codehaus/groovy/ast/Parameter.java index 79d6c07..e9035e4 100644 --- a/src/main/java/org/codehaus/groovy/ast/Parameter.java +++ b/src/main/java/org/codehaus/groovy/ast/Parameter.java @@ -51,6 +51,7 @@ public class Parameter extends AnnotatedNode implements Variable { this.hasDefaultValue = defaultValue != null; } + @Override public String toString() { return super.toString() + "[name:" + name + ((type == null) ? "" : " type: " + type.getName()) + ", hasDefaultValue: " + this.hasInitialExpression() + "]"; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java index ba4eaf0..b93f0c7 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java @@ -43,6 +43,7 @@ public class AnnotationConstantExpression extends ConstantExpression { super.visit(visitor); } + @Override public String toString() { return super.toString() + "[" + getValue() + "]"; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/ArrayExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/ArrayExpression.java index 49c4b17..ed41346 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/ArrayExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/ArrayExpression.java @@ -158,6 +158,7 @@ public class ArrayExpression extends Expression { return sizeExpressions; } + @Override public String toString() { if (hasInitializer()) { return super.toString() + "[elementType: " + getElementType() + ", init: {" + formatInitExpressions() + "}]"; diff --git a/src/main/java/org/codehaus/groovy/ast/expr/BinaryExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/BinaryExpression.java index 78f0405..785caa7 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/BinaryExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/BinaryExpression.java @@ -50,6 +50,7 @@ public class BinaryExpression extends Expression { this.safe = safe; } + @Override public String toString() { return super.toString() + "[" + leftExpression + operation + rightExpression + "]"; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/ClassExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/ClassExpression.java index 68faaa2..5d37c76 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/ClassExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/ClassExpression.java @@ -46,6 +46,7 @@ public class ClassExpression extends Expression { return getType().getName(); } + @Override public String toString() { return super.toString() + "[type: " + getType().getName() + "]"; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/ClosureExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/ClosureExpression.java index 19ea72d..d47d07a 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/ClosureExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/ClosureExpression.java @@ -52,6 +52,7 @@ public class ClosureExpression extends Expression { return this; } + @Override public String toString() { return super.toString() + InvokerHelper.toString(parameters) + "{ " + code + " }"; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/ConstantExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/ConstantExpression.java index 3576bca..665b969 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/ConstantExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/ConstantExpression.java @@ -72,6 +72,7 @@ public class ConstantExpression extends Expression { } } + @Override public String toString() { return super.toString() + "[" + value + "]"; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/ConstructorCallExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/ConstructorCallExpression.java index 51adf72..64acb45 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/ConstructorCallExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/ConstructorCallExpression.java @@ -102,6 +102,7 @@ public class ConstructorCallExpression extends Expression implements MethodCall this.usesAnonymousInnerClass = usage; } + @Override public String toString() { return super.toString() + "[type: " + getType() + " arguments: " + arguments + "]"; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/GStringExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/GStringExpression.java index 5a88a87..67f548a 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/GStringExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/GStringExpression.java @@ -64,6 +64,7 @@ public class GStringExpression extends Expression { return ret; } + @Override public String toString() { return super.toString() + "[strings: " + strings + " values: " + values + "]"; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/ListExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/ListExpression.java index 4b21441..7844f46 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/ListExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/ListExpression.java @@ -92,6 +92,7 @@ public class ListExpression extends Expression { return buffer.toString(); } + @Override public String toString() { return super.toString() + expressions; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/MapEntryExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/MapEntryExpression.java index 60ce946..1eae5b8 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/MapEntryExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/MapEntryExpression.java @@ -46,6 +46,7 @@ public class MapEntryExpression extends Expression { return ret; } + @Override public String toString() { return super.toString() + "(key: " + keyExpression + ", value: " + valueExpression + ")"; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/MapExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/MapExpression.java index 98bfd68..fe6c7e3 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/MapExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/MapExpression.java @@ -66,6 +66,7 @@ public class MapExpression extends Expression { return ret; } + @Override public String toString() { return super.toString() + mapEntryExpressions; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/MethodCallExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/MethodCallExpression.java index c9d8239..f0c2bee 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/MethodCallExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/MethodCallExpression.java @@ -235,6 +235,7 @@ public class MethodCallExpression extends Expression implements MethodCall { } } + @Override public String toString() { return super.toString() + "[object: " + objectExpression + " method: " + method + " arguments: " + arguments + "]"; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/PostfixExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/PostfixExpression.java index f96714e..5a89909 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/PostfixExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/PostfixExpression.java @@ -35,6 +35,7 @@ public class PostfixExpression extends Expression { this.expression = expression; } + @Override public String toString() { return super.toString() + "[" + expression + operation + "]"; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/PrefixExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/PrefixExpression.java index 4c73227..2e44e71 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/PrefixExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/PrefixExpression.java @@ -35,6 +35,7 @@ public class PrefixExpression extends Expression { this.expression = expression; } + @Override public String toString() { return super.toString() + "[" + operation + expression + "]"; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/StaticMethodCallExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/StaticMethodCallExpression.java index 1d0bea4..6480426 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/StaticMethodCallExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/StaticMethodCallExpression.java @@ -76,6 +76,7 @@ public class StaticMethodCallExpression extends Expression implements MethodCall return getOwnerType().getName() + "." + method + arguments.getText(); } + @Override public String toString() { return super.toString() + "[" + getOwnerType().getName() + "#" + method + " arguments: " + arguments + "]"; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/TernaryExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/TernaryExpression.java index 0a2d458..481ed10 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/TernaryExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/TernaryExpression.java @@ -55,6 +55,7 @@ public class TernaryExpression extends Expression { return ret; } + @Override public String toString() { return super.toString() +"[" + booleanExpression + " ? " + trueExpression + " : " + falseExpression + "]"; } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/TupleExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/TupleExpression.java index 74a858d..f422ba2 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/TupleExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/TupleExpression.java @@ -115,6 +115,7 @@ public class TupleExpression extends Expression implements Iterable<Expression> return buffer.toString(); } + @Override public String toString() { return super.toString() + getExpressions(); } diff --git a/src/main/java/org/codehaus/groovy/ast/expr/VariableExpression.java b/src/main/java/org/codehaus/groovy/ast/expr/VariableExpression.java index de0ecb2..04e9bdb 100644 --- a/src/main/java/org/codehaus/groovy/ast/expr/VariableExpression.java +++ b/src/main/java/org/codehaus/groovy/ast/expr/VariableExpression.java @@ -86,6 +86,7 @@ public class VariableExpression extends Expression implements Variable { return variable; } + @Override public String toString() { return super.toString() + "[variable: " + variable + (this.isDynamicTyped() ? "" : " type: " + getType()) + "]"; } diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/BlockStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/BlockStatement.java index 9710a5b..346205c 100644 --- a/src/main/java/org/codehaus/groovy/ast/stmt/BlockStatement.java +++ b/src/main/java/org/codehaus/groovy/ast/stmt/BlockStatement.java @@ -82,6 +82,7 @@ public class BlockStatement extends Statement { statements.addAll(listOfStatements); } + @Override public String toString() { return super.toString() + statements; } diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/CaseStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/CaseStatement.java index dcdfefa..13cc89f 100644 --- a/src/main/java/org/codehaus/groovy/ast/stmt/CaseStatement.java +++ b/src/main/java/org/codehaus/groovy/ast/stmt/CaseStatement.java @@ -56,6 +56,7 @@ public class CaseStatement extends Statement { visitor.visitCaseStatement(this); } + @Override public String toString() { return super.toString() + "[expression: " + expression + "; code: " + code + "]"; } diff --git a/src/main/java/org/codehaus/groovy/ast/stmt/ExpressionStatement.java b/src/main/java/org/codehaus/groovy/ast/stmt/ExpressionStatement.java index 0598773..7f424a3 100644 --- a/src/main/java/org/codehaus/groovy/ast/stmt/ExpressionStatement.java +++ b/src/main/java/org/codehaus/groovy/ast/stmt/ExpressionStatement.java @@ -54,6 +54,7 @@ public class ExpressionStatement extends Statement { return expression.getText(); } + @Override public String toString() { return super.toString() + "[expression:" + expression + "]"; } diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/BytecodeVariable.java b/src/main/java/org/codehaus/groovy/classgen/asm/BytecodeVariable.java index 8ca64fe..388102f 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/BytecodeVariable.java +++ b/src/main/java/org/codehaus/groovy/classgen/asm/BytecodeVariable.java @@ -98,6 +98,7 @@ public class BytecodeVariable { this.endLabel = endLabel; } + @Override public String toString() { return name + "(index=" + index + ",type=" + type + ",holder="+holder+")"; } diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/MopWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/MopWriter.java index eb43abe..01086a3 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/MopWriter.java +++ b/src/main/java/org/codehaus/groovy/classgen/asm/MopWriter.java @@ -62,10 +62,12 @@ public class MopWriter { hash = name.hashCode() << 2 + params.length; } + @Override public int hashCode() { return hash; } + @Override public boolean equals(Object obj) { if (!(obj instanceof MopKey)) { return false; diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/OperandStack.java b/src/main/java/org/codehaus/groovy/classgen/asm/OperandStack.java index 5dc3743..475e250 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/OperandStack.java +++ b/src/main/java/org/codehaus/groovy/classgen/asm/OperandStack.java @@ -638,6 +638,7 @@ public class OperandStack { push(ClassHelper.boolean_TYPE); } + @Override public String toString() { return "OperandStack(size="+stack.size()+":"+stack.toString()+")"; } diff --git a/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java b/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java index 6f207ce..fbe052c 100644 --- a/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java +++ b/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java @@ -235,11 +235,13 @@ public class CachedMethod extends MetaMethod implements Comparable { return 0; } + @Override public boolean equals(Object o) { return (o instanceof CachedMethod && cachedMethod.equals(((CachedMethod)o).cachedMethod)) || (o instanceof Method && cachedMethod.equals(o)); } + @Override public int hashCode() { if (hashCode == 0) { hashCode = cachedMethod.hashCode(); @@ -249,6 +251,7 @@ public class CachedMethod extends MetaMethod implements Comparable { return hashCode; } + @Override public String toString() { return cachedMethod.toString(); } diff --git a/src/main/java/org/codehaus/groovy/reflection/MixinInMetaClass.java b/src/main/java/org/codehaus/groovy/reflection/MixinInMetaClass.java index b54c2ff..93c075c 100644 --- a/src/main/java/org/codehaus/groovy/reflection/MixinInMetaClass.java +++ b/src/main/java/org/codehaus/groovy/reflection/MixinInMetaClass.java @@ -192,6 +192,7 @@ public class MixinInMetaClass { } } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof MixinInMetaClass)) return false; @@ -204,6 +205,7 @@ public class MixinInMetaClass { return true; } + @Override public int hashCode() { int result = super.hashCode(); result = 31 * result + (emc != null ? emc.hashCode() : 0); diff --git a/src/main/java/org/codehaus/groovy/runtime/AbstractComparator.java b/src/main/java/org/codehaus/groovy/runtime/AbstractComparator.java index db12114..b3234fd 100644 --- a/src/main/java/org/codehaus/groovy/runtime/AbstractComparator.java +++ b/src/main/java/org/codehaus/groovy/runtime/AbstractComparator.java @@ -21,6 +21,7 @@ package org.codehaus.groovy.runtime; import java.util.Comparator; public abstract class AbstractComparator<T> implements Comparator<T> { + @Override public boolean equals(Object obj) { return this == obj; } diff --git a/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java b/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java index c763099..4e40d25 100644 --- a/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java +++ b/src/main/java/org/codehaus/groovy/runtime/ConversionHandler.java @@ -157,6 +157,7 @@ public abstract class ConversionHandler implements InvocationHandler, Serializab * * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj instanceof Proxy) { obj = Proxy.getInvocationHandler(obj); @@ -174,6 +175,7 @@ public abstract class ConversionHandler implements InvocationHandler, Serializab * * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return delegate.hashCode(); } @@ -183,6 +185,7 @@ public abstract class ConversionHandler implements InvocationHandler, Serializab * * @see java.lang.Object#toString() */ + @Override public String toString() { return delegate.toString(); } diff --git a/src/main/java/org/codehaus/groovy/runtime/EncodingGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/EncodingGroovyMethods.java index 9d07177..a0991e8 100644 --- a/src/main/java/org/codehaus/groovy/runtime/EncodingGroovyMethods.java +++ b/src/main/java/org/codehaus/groovy/runtime/EncodingGroovyMethods.java @@ -133,6 +133,7 @@ public class EncodingGroovyMethods { return writer; } + @Override public String toString() { Writer buffer = new StringBuilderWriter(); @@ -329,6 +330,7 @@ public class EncodingGroovyMethods { return out; } + @Override public String toString() { Writer buffer = new StringBuilderWriter(); diff --git a/src/main/java/org/codehaus/groovy/runtime/HandleMetaClass.java b/src/main/java/org/codehaus/groovy/runtime/HandleMetaClass.java index 6a6ffd1..09c659d 100644 --- a/src/main/java/org/codehaus/groovy/runtime/HandleMetaClass.java +++ b/src/main/java/org/codehaus/groovy/runtime/HandleMetaClass.java @@ -119,6 +119,7 @@ public class HandleMetaClass extends DelegatingMetaClass { throw new UnsupportedOperationException(); } + @Override public boolean equals(Object obj) { return super.equals(obj) || getAdaptee().equals(obj) || (obj instanceof HandleMetaClass && equals(((HandleMetaClass)obj).getAdaptee())); } diff --git a/src/main/java/org/codehaus/groovy/runtime/IOGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/IOGroovyMethods.java index f9c7f20..c782f57 100644 --- a/src/main/java/org/codehaus/groovy/runtime/IOGroovyMethods.java +++ b/src/main/java/org/codehaus/groovy/runtime/IOGroovyMethods.java @@ -1513,6 +1513,7 @@ public class IOGroovyMethods extends DefaultGroovyMethodsSupport { return out; } + @Override public String toString() { Writer buffer = new StringBuilderWriter(); try { diff --git a/src/main/java/org/codehaus/groovy/runtime/MethodKey.java b/src/main/java/org/codehaus/groovy/runtime/MethodKey.java index aaa7e4a..4a9d6d1 100644 --- a/src/main/java/org/codehaus/groovy/runtime/MethodKey.java +++ b/src/main/java/org/codehaus/groovy/runtime/MethodKey.java @@ -52,6 +52,7 @@ public abstract class MethodKey { return new DefaultMethodKey(sender, name, paramTypes, isCallToSuper); } + @Override public boolean equals(Object that) { if (this == that) { return true; @@ -77,6 +78,7 @@ public abstract class MethodKey { return true; } + @Override public int hashCode() { if (hash == 0) { hash = createHashCode(); @@ -87,6 +89,7 @@ public abstract class MethodKey { return hash; } + @Override public String toString() { return super.toString() + "[name:" + name + "; params:" + getParamterTypes(); } diff --git a/src/main/java/org/codehaus/groovy/runtime/NullObject.java b/src/main/java/org/codehaus/groovy/runtime/NullObject.java index c481268..d4d42f6 100644 --- a/src/main/java/org/codehaus/groovy/runtime/NullObject.java +++ b/src/main/java/org/codehaus/groovy/runtime/NullObject.java @@ -101,6 +101,7 @@ public class NullObject extends GroovyObjectSupport { * @param to - the reference object with which to compare * @return - true if this object is the same as the to argument */ + @Override public boolean equals(Object to) { return to == null; } @@ -170,10 +171,12 @@ public class NullObject extends GroovyObjectSupport { return false; } + @Override public String toString() { return "null"; } + @Override public int hashCode() { throw new NullPointerException("Cannot invoke method hashCode() on null object"); } diff --git a/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java b/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java index 5fd18bc..d717302 100644 --- a/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java +++ b/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java @@ -86,6 +86,7 @@ public class StringBufferWriter extends Writer { /** * Return the buffer's current value as a string. */ + @Override public String toString() { return buffer.toString(); } diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java index d330f59..3d280bf 100644 --- a/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java +++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java @@ -1115,6 +1115,7 @@ public class ConcurrentReaderHashMap return oldValue; } + @Override public boolean equals(Object o) { if (!(o instanceof Map.Entry)) return false; @@ -1122,10 +1123,12 @@ public class ConcurrentReaderHashMap return (key.equals(e.getKey()) && value.equals(e.getValue())); } + @Override public int hashCode() { return key.hashCode() ^ value.hashCode(); } + @Override public String toString() { return key + "=" + value; } diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java index e7c7d0b..3b5b08e 100644 --- a/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java +++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java @@ -70,6 +70,7 @@ public class MetaMethodIndex { public CacheEntry cachedMethod, cachedMethodForSuper, cachedStaticMethod; + @Override public String toString () { return "[" + name + ", " + cls.getName() + "]"; } diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/OwnedMetaClass.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/OwnedMetaClass.java index b93498f..a764e03 100644 --- a/src/main/java/org/codehaus/groovy/runtime/metaclass/OwnedMetaClass.java +++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/OwnedMetaClass.java @@ -141,14 +141,17 @@ public abstract class OwnedMetaClass extends DelegatingMetaClass { ownerMetaClass.setProperty(object, property, newValue); } + @Override public boolean equals(Object obj) { return delegate.equals(obj); } + @Override public int hashCode() { return delegate.hashCode(); } + @Override public String toString() { return super.toString() + "[" + delegate.toString()+ "]"; } diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/ReflectionMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/ReflectionMetaMethod.java index c252c99..a3028d0 100644 --- a/src/main/java/org/codehaus/groovy/runtime/metaclass/ReflectionMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/ReflectionMetaMethod.java @@ -64,6 +64,7 @@ public class ReflectionMetaMethod extends MetaMethod { } } + @Override public String toString () { return method.toString(); } diff --git a/src/main/java/org/codehaus/groovy/syntax/CSTNode.java b/src/main/java/org/codehaus/groovy/syntax/CSTNode.java index 9081c57..821f149 100644 --- a/src/main/java/org/codehaus/groovy/syntax/CSTNode.java +++ b/src/main/java/org/codehaus/groovy/syntax/CSTNode.java @@ -326,6 +326,7 @@ public abstract class CSTNode { /** * Formats the node as a <code>String</code> and returns it. */ + @Override public String toString() { Writer string = new StringBuilderWriter(); write(new PrintWriter(string)); diff --git a/src/main/java/org/codehaus/groovy/syntax/ReadException.java b/src/main/java/org/codehaus/groovy/syntax/ReadException.java index f8e656d..c2a433a 100644 --- a/src/main/java/org/codehaus/groovy/syntax/ReadException.java +++ b/src/main/java/org/codehaus/groovy/syntax/ReadException.java @@ -43,6 +43,7 @@ public class ReadException extends GroovyException { return this.cause; } + @Override public String toString() { String message = super.getMessage(); if (message == null || message.trim().isEmpty()) { diff --git a/src/main/java/org/codehaus/groovy/tools/shell/IO.java b/src/main/java/org/codehaus/groovy/tools/shell/IO.java index c0adb8a..b103c33 100644 --- a/src/main/java/org/codehaus/groovy/tools/shell/IO.java +++ b/src/main/java/org/codehaus/groovy/tools/shell/IO.java @@ -205,6 +205,7 @@ public class IO implements Closeable { this.name = name; } + @Override public String toString() { return name; } diff --git a/src/main/java/org/codehaus/groovy/util/FastArray.java b/src/main/java/org/codehaus/groovy/util/FastArray.java index 220bfcc..6d0e4b2 100644 --- a/src/main/java/org/codehaus/groovy/util/FastArray.java +++ b/src/main/java/org/codehaus/groovy/util/FastArray.java @@ -136,6 +136,7 @@ public class FastArray implements Cloneable, Serializable { return data; } + @Override public String toString() { if (size() == 0) return "[]"; return toList().toString(); diff --git a/src/main/java/org/codehaus/groovy/util/LazyReference.java b/src/main/java/org/codehaus/groovy/util/LazyReference.java index a8abc15..b3110c9 100644 --- a/src/main/java/org/codehaus/groovy/util/LazyReference.java +++ b/src/main/java/org/codehaus/groovy/util/LazyReference.java @@ -65,6 +65,7 @@ public abstract class LazyReference<T> extends LockableObject { public abstract T initValue(); + @Override public String toString() { T res = reference.get(); if (res == null) diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java index 5bf8c51..b1c48c0 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java @@ -43,6 +43,7 @@ public class AntProjectPropertiesDelegate extends Hashtable<String, Object> { project = null; } + @Override public synchronized int hashCode() { return project.getProperties().hashCode(); } @@ -86,10 +87,12 @@ public class AntProjectPropertiesDelegate extends Hashtable<String, Object> { return project.getProperties().containsValue(value); } + @Override public synchronized boolean equals(Object o) { return project.getProperties().equals(o); } + @Override public synchronized String toString() { return project.getProperties().toString(); } diff --git a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java index 04eafde..bc8273f 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java +++ b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java @@ -551,6 +551,7 @@ public class StructuredSyntaxDocumentFilter extends DocumentFilter { return start.getOffset(); } + @Override public String toString() { return start.toString() + " " + end.toString(); } diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyType.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyType.java index 1786b8d..0c222e6 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyType.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyType.java @@ -46,5 +46,6 @@ public interface GroovyType { * "<code>java.lang.String[][]</code>", and the parameterized type * <code>List<Integer></code> returns "<code>java.util.List<java.lang.Integer></code>". */ + @Override String toString(); } diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ArrayClassDocWrapper.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ArrayClassDocWrapper.java index c93020a..5930ef3 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ArrayClassDocWrapper.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ArrayClassDocWrapper.java @@ -188,6 +188,7 @@ public class ArrayClassDocWrapper implements GroovyClassDoc { return delegate.typeName(); } + @Override public String toString() { return delegate.toString(); } diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java index 2932586..809cdc9 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java @@ -50,6 +50,7 @@ public class MockOutputTool implements OutputTool { return (String) output.get(fileName); } + @Override public String toString() { return "dirs:" + outputAreas + ", files:" + output.keySet(); } diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java index c212c8d..fec4213 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java @@ -59,6 +59,7 @@ public class SimpleGroovyDoc implements GroovyDoc/*, GroovyTokenTypes*/ { return name; } + @Override public String toString() { return "" + getClass() + "(" + name + ")"; } diff --git a/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java b/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java index 32754b4..26a6e8e 100644 --- a/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java +++ b/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java @@ -359,6 +359,7 @@ public class GroovyMBean extends GroovyObjectSupport { * * @return the user readable description */ + @Override public String toString() { StringBuilder buf = new StringBuilder(); buf.append("MBean Name:") diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java index df1958d..a64fab6 100644 --- a/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java +++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java @@ -378,6 +378,7 @@ public class JsonBuilder extends GroovyObjectSupport implements Writable { * * @return a JSON output */ + @Override public String toString() { return generator.toJson(content); } diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java index 26bb74e..03da401 100644 --- a/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java +++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java @@ -97,6 +97,7 @@ public class JsonToken { } } + @Override public String toString() { return text + " (" + type + ") [" + startLine + ":" + startColumn + "-" + endLine + ":" + endColumn + "]"; } diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java index 789f6ad..7de6418 100644 --- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java +++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java @@ -608,6 +608,7 @@ public class CharBuf extends Writer implements CharSequence { return new String(buffer, start, end - start); } + @Override public String toString() { return new String(buffer, 0, location); } diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharSequenceValue.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharSequenceValue.java index bb6b626..49289e7 100644 --- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharSequenceValue.java +++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharSequenceValue.java @@ -65,6 +65,7 @@ public class CharSequenceValue implements Value, CharSequence { } } + @Override public String toString() { if (startIndex == 0 && endIndex == buffer.length) { return FastStringUtils.noCopyStringFromChars(buffer); @@ -151,6 +152,7 @@ public class CharSequenceValue implements Value, CharSequence { return null; } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof Value)) return false; @@ -165,6 +167,7 @@ public class CharSequenceValue implements Value, CharSequence { } + @Override public int hashCode() { int result = type != null ? type.hashCode() : 0; result = 31 * result + (buffer != null ? Arrays.hashCode(buffer) : 0); diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyValueMap.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyValueMap.java index 8afa32a..c3b5a82 100644 --- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyValueMap.java +++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyValueMap.java @@ -234,6 +234,7 @@ public class LazyValueMap extends AbstractMap<String, Object> implements ValueMa return map.size(); } + @Override public String toString() { if (map == null) buildMap(); return map.toString(); diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/NumberValue.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/NumberValue.java index bf07a20..5a4dbd6 100644 --- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/NumberValue.java +++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/NumberValue.java @@ -77,6 +77,7 @@ public class NumberValue extends java.lang.Number implements Value { } + @Override public String toString() { if (startIndex == 0 && endIndex == buffer.length) { return FastStringUtils.noCopyStringFromChars(buffer); @@ -126,6 +127,7 @@ public class NumberValue extends java.lang.Number implements Value { return null; } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof Value)) return false; @@ -140,6 +142,7 @@ public class NumberValue extends java.lang.Number implements Value { } + @Override public int hashCode() { int result = type != null ? type.hashCode() : 0; result = 31 * result + (buffer != null ? Arrays.hashCode(buffer) : 0); diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/SimpleCache.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/SimpleCache.java index ae544ac..aff2f07 100644 --- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/SimpleCache.java +++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/SimpleCache.java @@ -68,6 +68,7 @@ public class SimpleCache<K, V> implements Cache<K, V> { return cache.size(); } + @Override public String toString() { return cache.toString(); } diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueContainer.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueContainer.java index f2af7b1..63ac1fe 100644 --- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueContainer.java +++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueContainer.java @@ -98,6 +98,7 @@ public class ValueContainer implements CharSequence, Value { return toString(); } + @Override public String toString() { return type.toString(); } diff --git a/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java index c37ad9f..3b1bfbf 100644 --- a/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java +++ b/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java @@ -155,6 +155,7 @@ public class TemplateServlet extends AbstractHttpServlet { return true; } + @Override public String toString() { if (date == null) { return "Hit #" + hit; diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java b/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java index 97a899a..dfa280c 100644 --- a/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java +++ b/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java @@ -67,6 +67,7 @@ public class GroovyResultSetExtension extends GroovyObjectSupport { resultSet = set; } + @Override public String toString() { try { StringBuilder sb = new StringBuilder("["); diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyRowResult.java b/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyRowResult.java index fe50e02..24e9469 100644 --- a/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyRowResult.java +++ b/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyRowResult.java @@ -104,6 +104,7 @@ public class GroovyRowResult extends GroovyObjectSupport implements Map<String, } } + @Override public String toString() { return result.toString(); } @@ -139,6 +140,7 @@ public class GroovyRowResult extends GroovyObjectSupport implements Map<String, return result.entrySet(); } + @Override public boolean equals(Object o) { return result.equals(o); } @@ -156,6 +158,7 @@ public class GroovyRowResult extends GroovyObjectSupport implements Map<String, return null; } + @Override public int hashCode() { return result.hashCode(); } diff --git a/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableColumn.java b/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableColumn.java index 02b34ad..9021c82 100644 --- a/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableColumn.java +++ b/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableColumn.java @@ -41,6 +41,7 @@ public class DefaultTableColumn extends TableColumn { setIdentifier(identifier); } + @Override public String toString() { return super.toString() + "[header:" + getHeaderValue() + " valueModel:" + valueModel + "]"; } diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/SimpleTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/SimpleTemplateEngine.java index 9b45415..d7a49d5 100644 --- a/subprojects/groovy-templates/src/main/groovy/groovy/text/SimpleTemplateEngine.java +++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/SimpleTemplateEngine.java @@ -188,6 +188,7 @@ public class SimpleTemplateEngine extends TemplateEngine { * * @see java.lang.Object#toString() */ + @Override public String toString() { Writer sw = new StringBuilderWriter(); writeTo(sw); diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java index f64f9a9..ef13858 100644 --- a/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java +++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java @@ -295,6 +295,7 @@ public class StreamingTemplateEngine extends TemplateEngine { this.column = p.column; } + @Override public String toString() { return row + ":" + column; } diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/XmlTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/XmlTemplateEngine.java index 0484ba0..9bab98d 100644 --- a/subprojects/groovy-templates/src/main/groovy/groovy/text/XmlTemplateEngine.java +++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/XmlTemplateEngine.java @@ -262,6 +262,7 @@ public class XmlTemplateEngine extends TemplateEngine { return out; } + @Override public String toString() { Object o = result.get(); if (o != null) { @@ -336,6 +337,7 @@ public class XmlTemplateEngine extends TemplateEngine { this.indentation = indentation; } + @Override public String toString() { return "XmlTemplateEngine"; } diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java index 362ab5f..48db48a 100644 --- a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java +++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java @@ -514,6 +514,7 @@ public abstract class BaseTemplate implements Writable { } } + @Override public String toString() { Writer wrt = new StringBuilderWriter(512); try { diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java index 9a2fcae..abbbd0e 100644 --- a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java +++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java @@ -284,6 +284,7 @@ public class MarkupTemplateEngine extends TemplateEngine { return new TemplateResource(baseName, locale, extension); } + @Override public String toString() { return baseName + (locale != null ? "_" + locale : "") + "." + extension; } diff --git a/subprojects/groovy-test/src/main/java/org/apache/groovy/test/ScriptTestAdapter.java b/subprojects/groovy-test/src/main/java/org/apache/groovy/test/ScriptTestAdapter.java index ca8370e..efb05bb 100644 --- a/subprojects/groovy-test/src/main/java/org/apache/groovy/test/ScriptTestAdapter.java +++ b/subprojects/groovy-test/src/main/java/org/apache/groovy/test/ScriptTestAdapter.java @@ -52,6 +52,7 @@ public class ScriptTestAdapter implements Test { } } + @Override public String toString() { return "TestCase for script: " + scriptClass.getName(); } diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java b/subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java index 5272042..ad07dc9 100644 --- a/subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java +++ b/subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java @@ -563,6 +563,7 @@ public class DOMCategory { return null; } + @Override public String toString() { return DOMCategory.toString(this); } diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/GPathResult.java b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/GPathResult.java index 9447eb4..731995c 100644 --- a/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/GPathResult.java +++ b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/GPathResult.java @@ -271,6 +271,7 @@ public abstract class GPathResult extends GroovyObjectSupport implements Writabl * * @return the GPathResult, converted to a <code>String</code> */ + @Override public String toString() { return text(); }
