X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FAWSThread.java;h=edb56a94327a25d887d3db1a932fe1022d18818d;hb=cf82c19425ee457a01c3f1a04aabfb0d9817af6f;hp=0167690aa3db669b5dc359e14792c4eed3f691f7;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/jalview/ws/AWSThread.java b/src/jalview/ws/AWSThread.java
index 0167690..edb56a9 100644
--- a/src/jalview/ws/AWSThread.java
+++ b/src/jalview/ws/AWSThread.java
@@ -6,14 +6,16 @@
*
* 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;
@@ -27,6 +29,7 @@ import jalview.datamodel.SequenceI;
import jalview.gui.AlignFrame;
import jalview.gui.WebserviceInfo;
import jalview.gui.FeatureRenderer.FeatureRendererSettings;
+import jalview.util.MessageManager;
public abstract class AWSThread extends Thread
{
@@ -121,8 +124,8 @@ public abstract class AWSThread extends Thread
} catch (Exception ex)
{
// Deal with Transaction exceptions
- wsInfo.appendProgressText(jobs[j].jobnum, "\n" + WebServiceName
- + " Server exception!\n" + ex.getMessage());
+ wsInfo.appendProgressText(jobs[j].jobnum,
+ MessageManager.formatMessage("info.server_exception", new String[]{WebServiceName,ex.getMessage()}));
// always output the exception's stack trace to the log
Cache.log.warn(WebServiceName + " job(" + jobs[j].jobnum
+ ") Server exception.");
@@ -187,7 +190,7 @@ public abstract class AWSThread extends Thread
Cache.log
.debug("WebServiceJob poll loop finished with no jobs created.");
wsInfo.setStatus(wsInfo.STATE_STOPPED_ERROR);
- wsInfo.appendProgressText("No jobs ran.");
+ wsInfo.appendProgressText(MessageManager.getString("info.no_jobs_ran"));
wsInfo.setFinishedNoResults();
}
}