X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2FRestClient.java;h=202ea129b8ea781e4c654c39a745c2479fe3feb2;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=21b9e532146edf7917225f17cef5e0c665009433;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/ws/rest/RestClient.java b/src/jalview/ws/rest/RestClient.java index 21b9e53..202ea12 100644 --- a/src/jalview/ws/rest/RestClient.java +++ b/src/jalview/ws/rest/RestClient.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -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; @@ -39,10 +28,22 @@ import jalview.gui.AlignmentPanel; import jalview.gui.Desktop; import jalview.gui.WebserviceInfo; import jalview.io.packed.DataProvider.JvDataType; +import jalview.util.MessageManager; 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 * @@ -81,8 +82,11 @@ public class RestClient extends WSClient implements WSClientI, { this(service2, alignFrame, false); } + boolean headless = false; - public RestClient(RestServiceDescription service2, AlignFrame alignFrame, boolean nogui) + + public RestClient(RestServiceDescription service2, AlignFrame alignFrame, + boolean nogui) { service = service2; af = alignFrame; @@ -93,8 +97,9 @@ 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) @@ -104,7 +109,7 @@ public class RestClient extends WSClient implements WSClientI, if (!headless) { wsInfo = new WebserviceInfo(WebServiceJobTitle, WebServiceName + "\n" - + WebServiceReference); + + WebServiceReference, true); wsInfo.setRenderAsHtml(true); } @@ -137,8 +142,9 @@ public class RestClient extends WSClient implements WSClientI, final AlignFrame alignFrame) { JMenuItem submit = new JMenuItem(service.details.Name); - submit.setToolTipText(service.details.Action + " using " - + service.details.Name); + submit.setToolTipText(MessageManager.formatMessage( + "label.rest_client_submit", new String[] { + service.details.Action, service.details.Name })); submit.addActionListener(new ActionListener() { @@ -228,6 +234,7 @@ public class RestClient extends WSClient implements WSClientI, * informative name for results */ public String viewTitle; + protected void constructJob() { service.setInvolvesFlags(); @@ -254,9 +261,12 @@ 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 { @@ -265,9 +275,12 @@ 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 { @@ -275,8 +288,12 @@ 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 @@ -285,8 +302,11 @@ 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 " : "") - + af.getTitle(); + viewTitle = "" + + (av.hasHiddenColumns() ? (new StringBuffer(" ") + .append(MessageManager + .getString("label.visible_region_of")) + .toString()) : "") + af.getTitle(); } RestJobThread jobsthread = new RestJobThread(this); @@ -294,7 +314,8 @@ public class RestClient extends WSClient implements WSClientI, if (jobsthread.isValid()) { setWebserviceInfo(headless); - if (!headless) { + if (!headless) + { wsInfo.setthisService(this); jobsthread.setWebServiceInfo(wsInfo); } @@ -307,15 +328,18 @@ 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 iparams = new Hashtable(); jalview.ws.rest.params.JobConstant toolp; // toolp = new jalview.ws.rest.JobConstant("tool","jalview"); @@ -408,33 +432,6 @@ public class RestClient extends WSClient implements WSClientI, return lst; } - public static void main(String args[]) - { - try - { - RestClient[] clients = getRestClients(); - System.out.println("Got " + clients.length + " clients."); - int i = 0; - Vector urls = new Vector(); - for (RestClient cl : clients) - { - System.out.println("" + (++i) + ": " + cl.service.toString()); - urls.add(cl.service.toString()); - } - setRsbsServices(urls); - if (clients.length != getRestClients().length) - { - System.err - .println("Failed. Differing numbers of clients when stringified and parsed again."); - } - - } catch (Throwable x) - { - System.err.println("Failed. Unexpected exception."); - x.printStackTrace(); - } - } - public String getAction() { return service.details.Action;