X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FMsaResult.java;h=49fa4a78832534af5c50249f677789e0546922f4;hb=f71fdb6f83dfeeb61d6843553879f7d562ea405d;hp=99cab578a859b46760e5efdf245f938511105706;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/vamsas/objects/simple/MsaResult.java b/src/vamsas/objects/simple/MsaResult.java index 99cab57..49fa4a7 100755 --- a/src/vamsas/objects/simple/MsaResult.java +++ b/src/vamsas/objects/simple/MsaResult.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * 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. * @@ -58,20 +58,20 @@ public class MsaResult extends vamsas.objects.simple.Result implements this.msa = msa; } + @Override public synchronized boolean equals(java.lang.Object obj) { - if (!(obj instanceof MsaResult)) + if (obj == null) { return false; } - - MsaResult other = (MsaResult) obj; - - if (obj == null) + if (!(obj instanceof MsaResult)) { return false; } + MsaResult other = (MsaResult) obj; + if (this == obj) { return true; @@ -93,6 +93,7 @@ public class MsaResult extends vamsas.objects.simple.Result implements return _equals; } + @Override public synchronized int hashCode() { if (__hashCodeCalc)