X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FObject.java;h=713db9be9c0f88d7e82b1dc966ff51b8d7184a84;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=23eedec46797fecc05e92004cb1d6c4288690baf;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/vamsas/objects/simple/Object.java b/src/vamsas/objects/simple/Object.java index 23eedec..713db9b 100755 --- a/src/vamsas/objects/simple/Object.java +++ b/src/vamsas/objects/simple/Object.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) - * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -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)