X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FWsJobId.java;h=83c1c2f6fb9492c869fcc2bbaa6bc5e9a0278e28;hb=39c97de2f7b8ef87b42f121f37d4f158d1651fe9;hp=e067409e447d71025f7047d80e699793b155ac00;hpb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;p=jalview.git diff --git a/src/vamsas/objects/simple/WsJobId.java b/src/vamsas/objects/simple/WsJobId.java index e067409..83c1c2f 100755 --- a/src/vamsas/objects/simple/WsJobId.java +++ b/src/vamsas/objects/simple/WsJobId.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. * @@ -100,9 +100,8 @@ public class WsJobId implements java.io.Serializable } __equalsCalc = obj; boolean _equals; - _equals = true - && ((this.jobId == null && other.getJobId() == null) || (this.jobId != null && this.jobId - .equals(other.getJobId()))) + _equals = true && ((this.jobId == null && other.getJobId() == null) + || (this.jobId != null && this.jobId.equals(other.getJobId()))) && this.status == other.getStatus(); __equalsCalc = null; return _equals;