X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fjws1%2FMsaWSThread.java;h=af3db9c91c4574214d026e3577e751dc2ddaf2ab;hb=a394f0df3650d5b1e0b76e0319b650fe8ac98e41;hp=3eca13794d003409c4a072abe5ea29b274aae9ab;hpb=8a6fa9ea9900d0f106529c3f6283e7f9d76dd2cb;p=jalview.git
diff --git a/src/jalview/ws/jws1/MsaWSThread.java b/src/jalview/ws/jws1/MsaWSThread.java
index 3eca137..af3db9c 100644
--- a/src/jalview/ws/jws1/MsaWSThread.java
+++ b/src/jalview/ws/jws1/MsaWSThread.java
@@ -1,19 +1,22 @@
/*
- * 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-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
- * Title: - *
- * - *- * Description: - *
- * - *- * Copyright: Copyright (c) 2004 - *
- * - *- * Company: Dundee University - *
- * - * @author not attributable - * @version 1.0 - */ class MsaWSThread extends JWS1Thread implements WSClientI { boolean submitGaps = false; // pass sequences including gaps to alignment @@ -80,7 +64,7 @@ class MsaWSThread extends JWS1Thread implements WSClientI subjobComplete = true; result = new MsaResult(); result.setFinished(true); - result.setStatus("Job never ran - input returned to user."); + result.setStatus(MessageManager.getString("label.job_never_ran")); } } @@ -103,8 +87,7 @@ class MsaWSThread extends JWS1Thread implements WSClientI int nseqs = 0; if (minlen < 0) { - throw new Error( - "Implementation error: minlen must be zero or more."); + throw new Error(MessageManager.getString("error.implementation_error_minlen_must_be_greater_zero")); } for (int i = 0; i < seqs.length; i++) { @@ -448,8 +431,7 @@ class MsaWSThread extends JWS1Thread implements WSClientI { if (!(job instanceof MsaWSJob)) { - throw new Error("StartJob(MsaWSJob) called on a WSJobInstance " - + job.getClass()); + throw new Error(MessageManager.formatMessage("error.implementation_error_msawbjob_called", new String[]{job.getClass().toString()})); } MsaWSJob j = (MsaWSJob) job; if (j.isSubmitted()) @@ -467,7 +449,7 @@ class MsaWSThread extends JWS1Thread implements WSClientI j.setSubmitted(true); j.result = new MsaResult(); j.result.setFinished(true); - j.result.setStatus("Empty Alignment Job"); + j.result.setStatus(MessageManager.getString("label.empty_alignment_job")); ((MsaResult) j.result).setMsa(null); } try @@ -485,10 +467,7 @@ class MsaWSThread extends JWS1Thread implements WSClientI { if (jobsubmit == null) { - throw new Exception( - "Server at " - + WsUrl - + " returned null object, it probably cannot be contacted. Try again later ?"); + throw new Exception(MessageManager.formatMessage("exception.web_service_returned_null_try_later", new String[]{WsUrl})); } throw new Exception(jobsubmit.getJobId()); @@ -508,9 +487,7 @@ class MsaWSThread extends JWS1Thread implements WSClientI WebserviceInfo.STATE_STOPPED_SERVERERROR); wsInfo.appendProgressText( j.getJobnum(), - "Failed to submit sequences for alignment.\n" - + "It is most likely that there is a problem with the server.\n" - + "Just close the window\n"); + MessageManager.getString("info.failed_to_submit_sequences_for_alignment")); // e.printStackTrace(); // TODO: JBPNote DEBUG } @@ -556,7 +533,7 @@ class MsaWSThread extends JWS1Thread implements WSClientI if (valign != null) { wsInfo.appendProgressText(jobs[j].getJobnum(), - "\nAlignment Object Method Notes\n"); + MessageManager.getString("info.alignment_object_method_notes")); String[] lines = valign.getMethod(); for (int line = 0; line < lines.length; line++) {