X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FSequenceSet.java;h=d5a269b3298eedf52935720366336cb8da9cae9d;hb=776efd50982732063b1433736c775313d381355e;hp=be8e36cf657f8e97482300dc833ca40312f1c0f4;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git diff --git a/src/vamsas/objects/simple/SequenceSet.java b/src/vamsas/objects/simple/SequenceSet.java index be8e36c..d5a269b 100755 --- a/src/vamsas/objects/simple/SequenceSet.java +++ b/src/vamsas/objects/simple/SequenceSet.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -55,15 +55,22 @@ public class SequenceSet 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 SequenceSet)) + { return false; + } SequenceSet other = (SequenceSet) obj; - if (obj == null) - return false; if (this == obj) + { return true; + } if (__equalsCalc != null) { return (__equalsCalc == obj); @@ -78,6 +85,7 @@ public class SequenceSet implements java.io.Serializable private boolean __hashCodeCalc = false; + @Override public synchronized int hashCode() { if (__hashCodeCalc)