X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2FRestClient.java;h=1fb9259a0ffc908389472376815832aa3c96af24;hb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;hp=f9b72e3245f63157003f3062b0740e40e6be277c;hpb=619cc880371f3228e6a1fb33c6bfb6e7a7e2622c;p=jalview.git diff --git a/src/jalview/ws/rest/RestClient.java b/src/jalview/ws/rest/RestClient.java index f9b72e3..1fb9259 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,7 +97,9 @@ public class RestClient extends WSClient implements WSClientI, public void setWebserviceInfo(boolean headless) { - WebServiceJobTitle = MessageManager.formatMessage("label.webservice_job_title", new String[]{service.details.Action,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) @@ -140,7 +142,9 @@ public class RestClient extends WSClient implements WSClientI, final AlignFrame alignFrame) { JMenuItem submit = new JMenuItem(service.details.Name); - submit.setToolTipText(MessageManager.formatMessage("label.rest_client_submit", new String[]{service.details.Action,service.details.Name})); + submit.setToolTipText(MessageManager.formatMessage( + "label.rest_client_submit", new String[] { + service.details.Action, service.details.Name })); submit.addActionListener(new ActionListener() { @@ -257,7 +261,12 @@ public class RestClient extends WSClient implements WSClientI, _input = new AlignmentView(av.getAlignment(), av.getColumnSelection(), av.getSelectionGroup(), av.hasHiddenColumns(), true, true); - viewTitle = MessageManager.formatMessage("label.select_visible_region_of", new String[]{(av.hasHiddenColumns() ? MessageManager.getString("label.visible") : ""),af.getTitle()}); + viewTitle = MessageManager.formatMessage( + "label.select_visible_region_of", + new String[] { + (av.hasHiddenColumns() ? MessageManager + .getString("label.visible") : ""), + af.getTitle() }); } else { @@ -266,7 +275,12 @@ public class RestClient extends WSClient implements WSClientI, av.getColumnSelection(), av.getSelectionGroup(), av.hasHiddenColumns(), false, true); } - viewTitle = MessageManager.formatMessage("label.select_unselect_visible_regions_from", new String[]{(av.hasHiddenColumns() ? MessageManager.getString("label.visible") : ""),af.getTitle()}); + viewTitle = MessageManager.formatMessage( + "label.select_unselect_visible_regions_from", + new String[] { + (av.hasHiddenColumns() ? MessageManager + .getString("label.visible") : ""), + af.getTitle() }); } else { @@ -274,7 +288,12 @@ public class RestClient extends WSClient implements WSClientI, _input = new AlignmentView(av.getAlignment(), av.getColumnSelection(), av.getSelectionGroup(), av.hasHiddenColumns(), true, true); - viewTitle = MessageManager.formatMessage("label.select_visible_region_of", new String[]{(av.hasHiddenColumns() ? MessageManager.getString("label.visible") : ""),af.getTitle()}); + viewTitle = MessageManager.formatMessage( + "label.select_visible_region_of", + new String[] { + (av.hasHiddenColumns() ? MessageManager + .getString("label.visible") : ""), + af.getTitle() }); } } else @@ -283,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() ? (new StringBuffer(" ").append(MessageManager.getString("label.visible_region_of")).toString()) : "") - + af.getTitle(); + viewTitle = "" + + (av.hasHiddenColumns() ? (new StringBuffer(" ") + .append(MessageManager + .getString("label.visible_region_of")) + .toString()) : "") + af.getTitle(); } RestJobThread jobsthread = new RestJobThread(this); @@ -306,15 +328,18 @@ public class RestClient extends WSClient implements WSClientI, .showMessageDialog( Desktop.desktop, (jobsthread.hasWarnings() ? jobsthread.getWarnings() - : MessageManager.getString("label.job_couldnt_be_started_check_input")), - MessageManager.getString("label.unable_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 = MessageManager.getString("label.multiharmony"); + 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");