X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2FRestClient.java;h=5ce1d5dfa0f1ddfdf8848574b107ed28ca309192;hb=b5d61763044c1d72f06ce0e50da2171422a3774b;hp=470c96f8e39fb12df0591c518f644e3fa92de89a;hpb=58afea88095280d807e5c2ac8b9155de5ba3503c;p=jalview.git

diff --git a/src/jalview/ws/rest/RestClient.java b/src/jalview/ws/rest/RestClient.java
index 470c96f..5ce1d5d 100644
--- a/src/jalview/ws/rest/RestClient.java
+++ b/src/jalview/ws/rest/RestClient.java
@@ -20,17 +20,6 @@
  */
 package jalview.ws.rest;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.event.MenuEvent;
-import javax.swing.event.MenuListener;
-
 import jalview.bin.Cache;
 import jalview.datamodel.AlignmentView;
 import jalview.gui.AlignFrame;
@@ -44,6 +33,17 @@ import jalview.ws.WSClient;
 import jalview.ws.WSClientI;
 import jalview.ws.WSMenuEntryProviderI;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
+
 /**
  * @author JimP
  * 
@@ -97,8 +97,7 @@ public class RestClient extends WSClient implements WSClientI,
 
   public void setWebserviceInfo(boolean headless)
   {
-    WebServiceJobTitle = service.details.Action + " using "
-            + service.details.Name;
+    WebServiceJobTitle = MessageManager.formatMessage("label.webservice_job_title", new String[]{service.details.Action,service.details.Name});
     WebServiceName = service.details.Name;
     WebServiceReference = "No reference - go to url for more info";
     if (service.details.description != null)
@@ -108,7 +107,7 @@ public class RestClient extends WSClient implements WSClientI,
     if (!headless)
     {
       wsInfo = new WebserviceInfo(WebServiceJobTitle, WebServiceName + "\n"
-              + WebServiceReference);
+              + WebServiceReference, true);
       wsInfo.setRenderAsHtml(true);
     }
 
@@ -258,9 +257,7 @@ public class RestClient extends WSClient implements WSClientI,
           _input = new AlignmentView(av.getAlignment(),
                   av.getColumnSelection(), av.getSelectionGroup(),
                   av.hasHiddenColumns(), true, true);
-          viewTitle = "selected "
-                  + (av.hasHiddenColumns() ? "visible" : "")
-                  + " region of " + af.getTitle();
+          viewTitle = MessageManager.formatMessage("label.select_visible_region_of", new String[]{(av.hasHiddenColumns() ? MessageManager.getString("label.visible") : ""),af.getTitle()});
         }
         else
         {
@@ -269,9 +266,7 @@ public class RestClient extends WSClient implements WSClientI,
                   av.getColumnSelection(), av.getSelectionGroup(),
                   av.hasHiddenColumns(), false, true);
         }
-        viewTitle = "select and unselected "
-                + (av.hasHiddenColumns() ? "visible" : "")
-                + " regions from " + af.getTitle();
+        viewTitle = MessageManager.formatMessage("label.select_unselect_visible_regions_from", new String[]{(av.hasHiddenColumns() ? MessageManager.getString("label.visible") : ""),af.getTitle()});
       }
       else
       {
@@ -279,8 +274,7 @@ public class RestClient extends WSClient implements WSClientI,
         _input = new AlignmentView(av.getAlignment(),
                 av.getColumnSelection(), av.getSelectionGroup(),
                 av.hasHiddenColumns(), true, true);
-        viewTitle = "selected " + (av.hasHiddenColumns() ? "visible" : "")
-                + " region of " + af.getTitle();
+        viewTitle = MessageManager.formatMessage("label.select_visible_region_of", new String[]{(av.hasHiddenColumns() ? MessageManager.getString("label.visible") : ""),af.getTitle()});
       }
     }
     else
@@ -289,7 +283,7 @@ public class RestClient extends WSClient implements WSClientI,
       _input = new AlignmentView(av.getAlignment(),
               av.getColumnSelection(), null, av.hasHiddenColumns(), false,
               true);
-      viewTitle = "" + (av.hasHiddenColumns() ? "visible region of " : "")
+      viewTitle = "" + (av.hasHiddenColumns() ? (new StringBuffer(" ").append(MessageManager.getString("label.visible_region_of")).toString()) : "")
               + af.getTitle();
     }
 
@@ -312,15 +306,15 @@ public class RestClient extends WSClient implements WSClientI,
               .showMessageDialog(
                       Desktop.desktop,
                       (jobsthread.hasWarnings() ? jobsthread.getWarnings()
-                              : "The Job couldn't be started. Please check your input, and the Jalview console for any warning messages."),
-                      "Unable to start web service analysis",
+                              : MessageManager.getString("label.job_couldnt_be_started_check_input")),
+                      MessageManager.getString("label.unable_start_web_service_analysis"),
                       JOptionPane.WARNING_MESSAGE);
     }
   }
 
   public static RestClient makeShmmrRestClient()
   {
-    String action = "Analysis", description = "Sequence Harmony and Multi-Relief (Brandt et al. 2010)", name = "Multi-Harmony";
+    String action = "Analysis", description = "Sequence Harmony and Multi-Relief (Brandt et al. 2010)", name = MessageManager.getString("label.multiharmony");
     Hashtable<String, InputType> iparams = new Hashtable<String, InputType>();
     jalview.ws.rest.params.JobConstant toolp;
     // toolp = new jalview.ws.rest.JobConstant("tool","jalview");