X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FWsJobId.java;h=83c1c2f6fb9492c869fcc2bbaa6bc5e9a0278e28;hb=fc7dac25fd7a4eac42083e9aa94d1e752cabbe8b;hp=22fa55573ef4f06243ecb80a57659c67c760771a;hpb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;p=jalview.git diff --git a/src/vamsas/objects/simple/WsJobId.java b/src/vamsas/objects/simple/WsJobId.java index 22fa555..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.0b1) - * 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;