diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/warnings/MethodWarning.java b/com.ibm.wala.core/src/com/ibm/wala/util/warnings/MethodWarning.java index ae20092d3..6df13b57e 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/util/warnings/MethodWarning.java +++ b/com.ibm.wala.core/src/com/ibm/wala/util/warnings/MethodWarning.java @@ -36,29 +36,5 @@ public abstract class MethodWarning extends Warning { return method; } - @Override - public int hashCode() { - final int prime = 31; - int result = super.hashCode(); - result = prime * result + ((method == null) ? 0 : method.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (!super.equals(obj)) - return false; - if (getClass() != obj.getClass()) - return false; - final MethodWarning other = (MethodWarning) obj; - if (method == null) { - if (other.method != null) - return false; - } else if (!method.equals(other.method)) - return false; - return true; - } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/warnings/ResolutionFailure.java b/com.ibm.wala.core/src/com/ibm/wala/util/warnings/ResolutionFailure.java index b3aa974f3..0921da256 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/util/warnings/ResolutionFailure.java +++ b/com.ibm.wala.core/src/com/ibm/wala/util/warnings/ResolutionFailure.java @@ -13,23 +13,24 @@ package com.ibm.wala.util.warnings; import com.ibm.wala.ipa.callgraph.CGNode; /** - * A failure to resolve some entity while processing a particular - * node + * A failure to resolve some entity while processing a particular node * * @author sfink */ public class ResolutionFailure extends MethodWarning { - final T ref; final String message; /** - * @throws NullPointerException if node is null + * @throws NullPointerException if node is null */ public ResolutionFailure(CGNode node, T ref, String message) throws NullPointerException { super(Warning.SEVERE, node.getMethod().getReference()); - this.message = message; - this.ref = ref; + if (message == null) { + this.message = getClass() + " " + getMethod() + " " + ref; + } else { + this.message = getClass() + " " + getMethod() + ": " + message + " for " + ref; + } } private ResolutionFailure(CGNode node, T ref) { @@ -41,11 +42,7 @@ public class ResolutionFailure extends MethodWarning { */ @Override public String getMsg() { - if (message == null) { - return getClass() + " " + getMethod() + " " + ref; - } else { - return getClass() + " " + getMethod() + ": " + message + " for " + ref; - } + return message; } public static ResolutionFailure create(CGNode node, T ref, String msg) throws IllegalArgumentException { @@ -61,39 +58,4 @@ public class ResolutionFailure extends MethodWarning { } return new ResolutionFailure(node, ref); } - - @Override - public int hashCode() { - final int prime = 31; - int result = super.hashCode(); - result = prime * result + ((message == null) ? 0 : message.hashCode()); - result = prime * result + ((ref == null) ? 0 : ref.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (!super.equals(obj)) - return false; - if (getClass() != obj.getClass()) - return false; - final ResolutionFailure other = (ResolutionFailure) obj; - if (message == null) { - if (other.message != null) - return false; - } else if (!message.equals(other.message)) - return false; - if (ref == null) { - if (other.ref != null) - return false; - } else if (!ref.equals(other.ref)) - return false; - return true; - } - - - - } diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/warnings/Warning.java b/com.ibm.wala.core/src/com/ibm/wala/util/warnings/Warning.java index 51e51058e..5d48010b1 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/util/warnings/Warning.java +++ b/com.ibm.wala.core/src/com/ibm/wala/util/warnings/Warning.java @@ -65,7 +65,7 @@ public abstract class Warning implements Comparable { } @Override - public boolean equals(Object obj) { + public final boolean equals(Object obj) { if (obj instanceof Warning) { Warning other = (Warning) obj; return (getMsg().equals(other.getMsg()) && getLevel() == other.getLevel()); @@ -75,7 +75,7 @@ public abstract class Warning implements Comparable { } @Override - public int hashCode() { + public final int hashCode() { return 1499 * getMsg().hashCode() + getLevel(); }