From 2e7d1bb669e3ee26efe060ca5ea92ef73cebff83 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 6 Feb 2016 17:38:26 +0000 Subject: Add return type to MethodSignature --- .../org/zwobble/couscous/ast/MethodSignature.java | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/ast/MethodSignature.java') diff --git a/src/main/java/org/zwobble/couscous/ast/MethodSignature.java b/src/main/java/org/zwobble/couscous/ast/MethodSignature.java index fb2dc64..d7bc725 100644 --- a/src/main/java/org/zwobble/couscous/ast/MethodSignature.java +++ b/src/main/java/org/zwobble/couscous/ast/MethodSignature.java @@ -1,15 +1,16 @@ package org.zwobble.couscous.ast; import java.util.List; -import java.util.Objects; public class MethodSignature { - private String name; - private List arguments; + private final String name; + private final List arguments; + private final TypeName returnType; - public MethodSignature(String name, List arguments) { + public MethodSignature(String name, List arguments, TypeName returnType) { this.name = name; this.arguments = arguments; + this.returnType = returnType; } public String getName() { @@ -25,6 +26,7 @@ public class MethodSignature { return "MethodSignature(" + "name='" + name + '\'' + ", arguments=" + arguments + + ", returnType=" + returnType + ')'; } @@ -32,13 +34,20 @@ public class MethodSignature { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; + MethodSignature that = (MethodSignature) o; - return Objects.equals(name, that.name) && - Objects.equals(arguments, that.arguments); + + if (!name.equals(that.name)) return false; + if (!arguments.equals(that.arguments)) return false; + return returnType.equals(that.returnType); + } @Override public int hashCode() { - return Objects.hash(name, arguments); + int result = name.hashCode(); + result = 31 * result + arguments.hashCode(); + result = 31 * result + returnType.hashCode(); + return result; } } -- cgit v1.2.3