X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FJobStateSummary.java;h=6b86775fd9f6ca6c035e611c95551ba15d4752de;hb=3d0101179759ef157b088ea135423cd909512d9f;hp=dd68f93e1012127c39cfc08f72eadf31c86000b9;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git diff --git a/src/jalview/ws/JobStateSummary.java b/src/jalview/ws/JobStateSummary.java index dd68f93..6b86775 100644 --- a/src/jalview/ws/JobStateSummary.java +++ b/src/jalview/ws/JobStateSummary.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) - * 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. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.ws; @@ -77,11 +79,11 @@ public class JobStateSummary { if (j.cancelled) { - cancelled++; - j.subjobComplete=true; - wsInfo.setStatus(j.jobnum, WebserviceInfo.STATE_CANCELLED_OK); - return; - } + cancelled++; + j.subjobComplete = true; + wsInfo.setStatus(j.jobnum, WebserviceInfo.STATE_CANCELLED_OK); + return; + } if (j.submitted) { String progheader = ""; @@ -117,7 +119,8 @@ public class JobStateSummary { serror++; j.subjobComplete = true; - wsInfo.setStatus(j.jobnum, WebserviceInfo.STATE_STOPPED_SERVERERROR); + wsInfo.setStatus(j.jobnum, + WebserviceInfo.STATE_STOPPED_SERVERERROR); } else if (j.isBroken()) { @@ -150,7 +153,8 @@ public class JobStateSummary } // } catch (OutOfMemoryError e) // { - // System.err.println("Out of memory when displaying status. Squashing error."); + // System.err.println("Out of memory when displaying status. Squashing + // error."); // wsInfo.appendProgressText(j.jobnum, // "..\n(Out of memory when displaying status)\n"); // }