X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FMsaResult.java;h=9e8b38959a7b2e1bf4c53bba9b55f4e8d1ad11de;hb=b06dd5c7f0f1a8d7b75fdf165b7d990681f2e2e5;hp=a14282000ab17f55ac7552b4ae6ff5d36ab3b471;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git diff --git a/src/vamsas/objects/simple/MsaResult.java b/src/vamsas/objects/simple/MsaResult.java index a142820..9e8b389 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.2b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * Copyright (C) 2015 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)