- Revision
- 1156
- Author
- rfscholte
- Date
- 2011-04-07 13:48:50 -0500 (Thu, 07 Apr 2011)
Log Message
Add @Override to hashCode(), equals() and toString() Add/remove these methods when required
Modified Paths
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethod.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/AnnoDef.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/ClassDef.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/FieldDef.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/MethodDef.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/PackageDef.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/TagDef.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/TypeDef.java
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java (1155 => 1156)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java 2011-04-07 18:39:56 UTC (rev 1155) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java 2011-04-07 18:48:50 UTC (rev 1156) @@ -734,6 +734,12 @@ } return sb.toString(); } + + @Override + public int hashCode() + { + return getFullyQualifiedName().hashCode(); + } //ideally this shouldn't be required, but we must as long as Types can be created without classLibrary @Override
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethod.java (1155 => 1156)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethod.java 2011-04-07 18:39:56 UTC (rev 1155) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethod.java 2011-04-07 18:48:50 UTC (rev 1156) @@ -55,8 +55,6 @@ */ public String getCallSignature(); - public boolean equals( Object obj ); - /** * This method is NOT varArg aware. *
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/AnnoDef.java (1155 => 1156)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/AnnoDef.java 2011-04-07 18:39:56 UTC (rev 1155) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/AnnoDef.java 2011-04-07 18:48:50 UTC (rev 1156) @@ -32,15 +32,18 @@ public TypeDef typeDef; public final Map<String, ElemValueDef> args = new LinkedHashMap<String, ElemValueDef>(); + @Override public boolean equals(Object obj) { AnnoDef annoDef = (AnnoDef) obj; return annoDef.typeDef.equals(typeDef) && annoDef.args.equals(args); } + @Override public int hashCode() { return typeDef.hashCode() + args.hashCode(); } + @Override public String toString() { StringBuffer result = new StringBuffer(); result.append('@');
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/ClassDef.java (1155 => 1156)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/ClassDef.java 2011-04-07 18:39:56 UTC (rev 1155) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/ClassDef.java 2011-04-07 18:48:50 UTC (rev 1156) @@ -38,6 +38,7 @@ public Set<TypeDef> implementz = new HashSet<TypeDef>(); public String type = CLASS; + @Override public boolean equals(Object obj) { ClassDef classDef = (ClassDef) obj; return classDef.name.equals(name) @@ -48,18 +49,20 @@ && classDef.implementz.equals(implementz); } + @Override public int hashCode() { return name.hashCode() + type.hashCode() + typeParams.hashCode()+ modifiers.hashCode() + extendz.hashCode() + implementz.hashCode(); } + @Override public String toString() { StringBuffer result = new StringBuffer(); result.append(modifiers); - result.append(" "); + result.append(' '); result.append(type); - result.append(" "); + result.append(' '); result.append(name); //typeParams result.append(" extends ");
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/FieldDef.java (1155 => 1156)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/FieldDef.java 2011-04-07 18:39:56 UTC (rev 1155) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/FieldDef.java 2011-04-07 18:48:50 UTC (rev 1156) @@ -30,6 +30,7 @@ public boolean isVarArgs; public String body = ""; + @Override public boolean equals(Object obj) { FieldDef paramDef = (FieldDef) obj; boolean result = paramDef.name.equals(name) @@ -48,11 +49,13 @@ return result; } + @Override public int hashCode() { return name.hashCode() + (type != null ? type.hashCode() : 0) + dimensions + modifiers.hashCode() + (isVarArgs ? 79769989 : 0); } + @Override public String toString() { StringBuffer result = new StringBuffer(); result.append(modifiers);
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/MethodDef.java (1155 => 1156)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/MethodDef.java 2011-04-07 18:39:56 UTC (rev 1155) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/MethodDef.java 2011-04-07 18:48:50 UTC (rev 1156) @@ -26,6 +26,7 @@ import java.util.Set; public class MethodDef extends LocatedDef { + public String name = ""; public List<TypeVariableDef> typeParams; public TypeDef returnType; @@ -36,6 +37,7 @@ public int dimensions; public String body; + @Override public boolean equals(Object obj) { MethodDef methodDef = (MethodDef) obj; boolean result; @@ -58,6 +60,7 @@ return result; } + @Override public int hashCode() { return name.hashCode() + (returnType != null ? returnType.hashCode() : 0) + @@ -66,6 +69,7 @@ dimensions + (constructor ? 0 : 1); } + @Override public String toString() { StringBuffer result = new StringBuffer(); result.append(modifiers);
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/PackageDef.java (1155 => 1156)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/PackageDef.java 2011-04-07 18:39:56 UTC (rev 1155) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/PackageDef.java 2011-04-07 18:48:50 UTC (rev 1156) @@ -32,6 +32,12 @@ this.lineNumber = lineNumber; } + @Override + public int hashCode() + { + return name.hashCode(); + } + @Override public boolean equals(Object obj) { PackageDef packageDef = (PackageDef) obj; return packageDef.name.equals(name);
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/TagDef.java (1155 => 1156)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/TagDef.java 2011-04-07 18:39:56 UTC (rev 1155) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/TagDef.java 2011-04-07 18:48:50 UTC (rev 1156) @@ -34,6 +34,7 @@ this(name, text, -1); } + @Override public boolean equals(Object obj) { TagDef tagDef = (TagDef) obj; return tagDef.name.equals(name) @@ -41,10 +42,12 @@ && tagDef.lineNumber == lineNumber; } + @Override public int hashCode() { return name.hashCode() + text.hashCode() + lineNumber; } + @Override public String toString() { StringBuffer result = new StringBuffer(); result.append('@');
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/TypeDef.java (1155 => 1156)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/TypeDef.java 2011-04-07 18:39:56 UTC (rev 1155) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/structs/TypeDef.java 2011-04-07 18:48:50 UTC (rev 1156) @@ -36,6 +36,7 @@ this(name, 0); } + @Override public boolean equals(Object obj) { TypeDef typeDef = (TypeDef) obj; return typeDef.name.equals(name) @@ -43,6 +44,7 @@ && (typeDef.actualArgumentTypes != null ? typeDef.actualArgumentTypes.equals(actualArgumentTypes): actualArgumentTypes == null); } + @Override public int hashCode() { return name.hashCode() + dimensions + (actualArgumentTypes == null ? 0 : actualArgumentTypes.hashCode());
To unsubscribe from this list please visit:
