X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FObject.java;h=7e79e6aa041c0d316fe8e39f424fe21fc560d996;hb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;hp=23eedec46797fecc05e92004cb1d6c4288690baf;hpb=10e637daad8983c41db8679baabea5563d7371f4;p=jalview.git diff --git a/src/vamsas/objects/simple/Object.java b/src/vamsas/objects/simple/Object.java index 23eedec..7e79e6a 100755 --- a/src/vamsas/objects/simple/Object.java +++ b/src/vamsas/objects/simple/Object.java @@ -29,15 +29,21 @@ public abstract class Object implements java.io.Serializable private java.lang.Object __equalsCalc = null; + @Override public synchronized boolean equals(java.lang.Object obj) { - if (!(obj instanceof Object)) - return false; - Object other = (Object) obj; if (obj == null) + { + return false; + } + if (!(obj instanceof Object)) + { return false; + } if (this == obj) + { return true; + } if (__equalsCalc != null) { return (__equalsCalc == obj); @@ -51,6 +57,7 @@ public abstract class Object implements java.io.Serializable private boolean __hashCodeCalc = false; + @Override public synchronized int hashCode() { if (__hashCodeCalc)