git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Release_2_8_2_Branch' into JAL-429_phylip-file-support
[jalview.git]
/
src
/
jalview
/
ws
/
jws1
/
MsaWSThread.java
diff --git
a/src/jalview/ws/jws1/MsaWSThread.java
b/src/jalview/ws/jws1/MsaWSThread.java
index
2d111ca
..
a6ba751
100644
(file)
--- a/
src/jalview/ws/jws1/MsaWSThread.java
+++ b/
src/jalview/ws/jws1/MsaWSThread.java
@@
-26,6
+26,7
@@
import jalview.analysis.*;
import jalview.bin.*;
import jalview.datamodel.*;
import jalview.gui.*;
import jalview.bin.*;
import jalview.datamodel.*;
import jalview.gui.*;
+import jalview.util.MessageManager;
import jalview.ws.AWsJob;
import jalview.ws.JobStateSummary;
import jalview.ws.WSClientI;
import jalview.ws.AWsJob;
import jalview.ws.JobStateSummary;
import jalview.ws.WSClientI;
@@
-63,7
+64,7
@@
class MsaWSThread extends JWS1Thread implements WSClientI
subjobComplete = true;
result = new MsaResult();
result.setFinished(true);
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"));
}
}
}
}
@@
-86,8
+87,7
@@
class MsaWSThread extends JWS1Thread implements WSClientI
int nseqs = 0;
if (minlen < 0)
{
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++)
{
}
for (int i = 0; i < seqs.length; i++)
{
@@
-431,8
+431,7
@@
class MsaWSThread extends JWS1Thread implements WSClientI
{
if (!(job instanceof MsaWSJob))
{
{
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())
}
MsaWSJob j = (MsaWSJob) job;
if (j.isSubmitted())
@@
-450,7
+449,7
@@
class MsaWSThread extends JWS1Thread implements WSClientI
j.setSubmitted(true);
j.result = new MsaResult();
j.result.setFinished(true);
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
((MsaResult) j.result).setMsa(null);
}
try
@@
-468,10
+467,7
@@
class MsaWSThread extends JWS1Thread implements WSClientI
{
if (jobsubmit == null)
{
{
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());
}
throw new Exception(jobsubmit.getJobId());
@@
-491,9
+487,7
@@
class MsaWSThread extends JWS1Thread implements WSClientI
WebserviceInfo.STATE_STOPPED_SERVERERROR);
wsInfo.appendProgressText(
j.getJobnum(),
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
}
// e.printStackTrace(); // TODO: JBPNote DEBUG
}
@@
-539,7
+533,7
@@
class MsaWSThread extends JWS1Thread implements WSClientI
if (valign != null)
{
wsInfo.appendProgressText(jobs[j].getJobnum(),
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++)
{
String[] lines = valign.getMethod();
for (int line = 0; line < lines.length; line++)
{