X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FSequence.java;h=0615c3944f1498e8bdc30ece8db6117dd1defb8d;hb=e9a1c2c372f4bbf6cf658de3dba73ef326b20c20;hp=28dc9eb03f5a15dd8974c760497b362befad2335;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/vamsas/objects/simple/Sequence.java b/src/vamsas/objects/simple/Sequence.java index 28dc9eb..0615c39 100755 --- a/src/vamsas/objects/simple/Sequence.java +++ b/src/vamsas/objects/simple/Sequence.java @@ -78,15 +78,22 @@ public class Sequence implements java.io.Serializable private java.lang.Object __equalsCalc = null; + @Override public synchronized boolean equals(java.lang.Object obj) { + if (obj == null) + { + return false; + } if (!(obj instanceof Sequence)) + { return false; + } Sequence other = (Sequence) obj; - if (obj == null) - return false; if (this == obj) + { return true; + } if (__equalsCalc != null) { return (__equalsCalc == obj); @@ -94,16 +101,18 @@ public class Sequence implements java.io.Serializable __equalsCalc = obj; boolean _equals; _equals = true - && ((this.id == null && other.getId() == null) || (this.id != null && this.id - .equals(other.getId()))) - && ((this.seq == null && other.getSeq() == null) || (this.seq != null && this.seq - .equals(other.getSeq()))); + && ((this.id == null && other.getId() == null) + || (this.id != null && this.id.equals(other.getId()))) + && ((this.seq == null && other.getSeq() == null) + || (this.seq != null + && this.seq.equals(other.getSeq()))); __equalsCalc = null; return _equals; } private boolean __hashCodeCalc = false; + @Override public synchronized int hashCode() { if (__hashCodeCalc)