X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWebserviceInfo.java;fp=src%2Fjalview%2Fgui%2FWebserviceInfo.java;h=8dcf72a80f93461d3d8b3feb45fd17d58a229bb8;hb=bdba25716eaa9492681532cb443c18ed34237488;hp=2afec5509bff319260af3a929eff2e63dea26239;hpb=77abb3fac2965a8966410cd77cd749c7c1dc6453;p=jalview.git diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java index 2afec55..8dcf72a 100644 --- a/src/jalview/gui/WebserviceInfo.java +++ b/src/jalview/gui/WebserviceInfo.java @@ -356,8 +356,7 @@ public class WebserviceInfo extends GWebserviceInfo implements { if (jobpane < 0 || jobpane >= jobPanes.size()) { - throw new Error("setStatus called for non-existent job pane." - + jobpane); + throw new Error(MessageManager.formatMessage("error.setstatus_called_non_existent_job_pane", new String[]{Integer.valueOf(jobpane).toString()})); } switch (status) { @@ -651,8 +650,8 @@ public class WebserviceInfo extends GWebserviceInfo implements // anyhow - it has to stop threads and clean up // JBPNote : TODO: Instead of a warning, we should have an optional 'Are // you sure?' prompt - warnUser("This job cannot be cancelled.\nJust close the window.", - "Cancel job"); + warnUser(MessageManager.getString("warn.job_cannot_be_cancelled_close_window"), + MessageManager.getString("action.cancel_job")); } else { @@ -912,8 +911,7 @@ public class WebserviceInfo extends GWebserviceInfo implements { if (progressBarHandlers == null || !progressBars.contains(new Long(id))) { - throw new Error( - "call setProgressBar before registering the progress bar's handler."); + throw new Error(MessageManager.getString("error.call_setprogressbar_before_registering_handler")); } progressBarHandlers.put(new Long(id), handler); final JPanel progressPanel = (JPanel) progressBars.get(new Long(id)); @@ -929,10 +927,7 @@ public class WebserviceInfo extends GWebserviceInfo implements public void actionPerformed(ActionEvent e) { handler.cancelActivity(id); - us.setProgressBar( - "Cancelled " - + ((JLabel) progressPanel.getComponent(0)) - .getText(), id); + us.setProgressBar(MessageManager.formatMessage("label.cancelled_params", new String[]{((JLabel) progressPanel.getComponent(0)).getText()}), id); } }); progressPanel.add(cancel, BorderLayout.EAST);