X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FResult.java;h=170a1b52c0a935e81997d78d4d4fda8cc766a3c2;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=2434716366bb3fc7e45eed3c9475216825f684e3;hpb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;p=jalview.git diff --git a/src/vamsas/objects/simple/Result.java b/src/vamsas/objects/simple/Result.java index 2434716..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.9.0b2) - * Copyright (C) 2015 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. * @@ -310,8 +310,7 @@ public class Result implements java.io.Serializable } __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() @@ -320,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;