X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2FJobStateSummary.java;h=ab3fc66b165909ec9b26e58a2827109a2119c32f;hb=8364d3900ad4271d460ae15a245add45c66c2e89;hp=c117e4b3aee3d5445ced4a023b3cd9bd1fe094b6;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git diff --git a/src/jalview/ws/JobStateSummary.java b/src/jalview/ws/JobStateSummary.java index c117e4b..ab3fc66 100644 --- a/src/jalview/ws/JobStateSummary.java +++ b/src/jalview/ws/JobStateSummary.java @@ -1,13 +1,13 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle * * 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. - * + * * 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 @@ -119,12 +119,13 @@ public class JobStateSummary wsInfo.setStatus(j.jobnum, WebserviceInfo.STATE_STOPPED_ERROR); } // and pass on any sub-job messages to the user - StringBuffer output=new StringBuffer(); - if (OutputHeader!=null) { - + StringBuffer output = new StringBuffer(); + if (OutputHeader != null) + { + output.append(OutputHeader); } - if (progheader!=null) + if (progheader != null) { output.append(progheader); } @@ -134,8 +135,9 @@ public class JobStateSummary // probably won't be // enough memory to handle the results later on anyway. // try { - String stat = j.getStatus(); - if (stat!=null) { + String stat = j.getStatus(); + if (stat != null) + { output.append(stat); } // } catch (OutOfMemoryError e) @@ -145,7 +147,7 @@ public class JobStateSummary // "..\n(Out of memory when displaying status)\n"); // } } - wsInfo.setProgressText(j.jobnum,output.toString()); + wsInfo.setProgressText(j.jobnum, output.toString()); } else {