/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
{
serror++;
j.subjobComplete = true;
- wsInfo
- .setStatus(j.jobnum,
- WebserviceInfo.STATE_STOPPED_SERVERERROR);
+ wsInfo.setStatus(j.jobnum, WebserviceInfo.STATE_STOPPED_SERVERERROR);
}
else if (j.isBroken())
{
wsInfo.setStatus(j.jobnum, WebserviceInfo.STATE_STOPPED_ERROR);
}
// and pass on any sub-job messages to the user
- wsInfo.setProgressText(j.jobnum, OutputHeader);
- wsInfo.appendProgressText(j.jobnum, progheader);
+ StringBuffer output=new StringBuffer();
+ if (OutputHeader!=null) {
+
+ output.append(OutputHeader);
+ }
+ if (progheader!=null)
+ {
+ output.append(progheader);
+ }
if (j.hasStatus())
{
- // Could try to squash OOMs here, but it usually doesn't help - there probably won't be
+ // Could try to squash OOMs here, but it usually doesn't help - there
+ // probably won't be
// enough memory to handle the results later on anyway.
// try {
- wsInfo.appendProgressText(j.jobnum, j.getStatus());
+ String stat = j.getStatus();
+ if (stat!=null) {
+ output.append(stat);
+ }
// } catch (OutOfMemoryError e)
// {
// System.err.println("Out of memory when displaying status. Squashing error.");
// "..\n(Out of memory when displaying status)\n");
// }
}
+ wsInfo.setProgressText(j.jobnum,output.toString());
}
else
{