X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FResult.java;h=170a1b52c0a935e81997d78d4d4fda8cc766a3c2;hb=3459a8a691cb22508d7067f240b7254e588e77d3;hp=553f80823888f3f66826bdc641c6d5e0e0b9a99e;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git diff --git a/src/vamsas/objects/simple/Result.java b/src/vamsas/objects/simple/Result.java index 553f808..170a1b5 100755 --- a/src/vamsas/objects/simple/Result.java +++ b/src/vamsas/objects/simple/Result.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. * @@ -288,23 +288,29 @@ public class Result 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 Result)) + { return false; + } Result other = (Result) obj; - if (obj == null) - return false; if (this == obj) + { return true; + } if (__equalsCalc != null) { return (__equalsCalc == obj); } __equalsCalc = obj; boolean _equals; - _equals = true - && this.broken == other.isBroken() + _equals = true && this.broken == other.isBroken() && this.failed == other.isFailed() && this.finished == other.isFinished() && this.invalid == other.isInvalid() @@ -313,8 +319,9 @@ public class Result implements java.io.Serializable && this.running == other.isRunning() && this.serverError == other.isServerError() && this.state == other.getState() - && ((this.status == null && other.getStatus() == null) || (this.status != null && this.status - .equals(other.getStatus()))) + && ((this.status == null && other.getStatus() == null) + || (this.status != null + && this.status.equals(other.getStatus()))) && this.suspended == other.isSuspended(); __equalsCalc = null; return _equals; @@ -322,6 +329,7 @@ public class Result implements java.io.Serializable private boolean __hashCodeCalc = false; + @Override public synchronized int hashCode() { if (__hashCodeCalc)