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
JAL-1492 JAL-1397 JAL-643 JAL-969 modifiable flag on colourscheme indicating conserva...
[jalview.git]
/
src
/
jalview
/
gui
/
WebserviceInfo.java
diff --git
a/src/jalview/gui/WebserviceInfo.java
b/src/jalview/gui/WebserviceInfo.java
old mode 100755
(executable)
new mode 100644
(file)
index
27cbfe4
..
760db66
--- a/
src/jalview/gui/WebserviceInfo.java
+++ b/
src/jalview/gui/WebserviceInfo.java
@@
-30,6
+30,7
@@
import javax.swing.text.html.HTMLEditorKit;
import javax.swing.text.html.StyleSheet;
import jalview.jbgui.*;
import javax.swing.text.html.StyleSheet;
import jalview.jbgui.*;
+import jalview.util.MessageManager;
import jalview.ws.WSClientI;
/**
import jalview.ws.WSClientI;
/**
@@
-767,32
+768,32
@@
public class WebserviceInfo extends GWebserviceInfo implements
switch (currentStatus)
{
case STATE_QUEUING:
switch (currentStatus)
{
case STATE_QUEUING:
- g.drawString(title.concat(" - queuing"), 60, 30);
+ g.drawString(title.concat(" - ").concat(MessageManager.getString("label.state_queueing")), 60, 30);
break;
case STATE_RUNNING:
break;
case STATE_RUNNING:
- g.drawString(title.concat(" - running"), 60, 30);
+ g.drawString(title.concat(" - ").concat(MessageManager.getString("label.state_running")), 60, 30);
break;
case STATE_STOPPED_OK:
break;
case STATE_STOPPED_OK:
- g.drawString(title.concat(" - complete"), 60, 30);
+ g.drawString(title.concat(" - ").concat(MessageManager.getString("label.state_completed")), 60, 30);
break;
case STATE_CANCELLED_OK:
break;
case STATE_CANCELLED_OK:
- g.drawString(title.concat(" - job cancelled!"), 60, 30);
+ g.drawString(title.concat(" - ").concat(MessageManager.getString("label.state_job_cancelled")), 60, 30);
break;
case STATE_STOPPED_ERROR:
break;
case STATE_STOPPED_ERROR:
- g.drawString(title.concat(" - job error!"), 60, 30);
+ g.drawString(title.concat(" - ").concat(MessageManager.getString("label.state_job_error")), 60, 30);
break;
case STATE_STOPPED_SERVERERROR:
break;
case STATE_STOPPED_SERVERERROR:
- g.drawString(title.concat(" - Server Error! (try later)"), 60, 30);
+ g.drawString(title.concat(" - ").concat(MessageManager.getString("label.server_error_try_later")), 60, 30);
break;
}
break;
}
@@
-896,7
+897,7
@@
public class WebserviceInfo extends GWebserviceInfo implements
final JPanel progressPanel = (JPanel) progressBars.get(new Long(id));
if (handler.canCancel())
{
final JPanel progressPanel = (JPanel) progressBars.get(new Long(id));
if (handler.canCancel())
{
- JButton cancel = new JButton("Cancel");
+ JButton cancel = new JButton(MessageManager.getString("action.cancel"));
final IProgressIndicator us = this;
cancel.addActionListener(new ActionListener()
{
final IProgressIndicator us = this;
cancel.addActionListener(new ActionListener()
{