X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2FRestClient.java;h=08f137d519c48d921403152762f9cc03a7c0e801;hb=b87512d6e28a2a93ea2f08dcfbee320856c5c8de;hp=70f2507f1d2bb7d1e4dc9303eaa34fd6a2a334fa;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git diff --git a/src/jalview/ws/rest/RestClient.java b/src/jalview/ws/rest/RestClient.java index 70f2507..08f137d 100644 --- a/src/jalview/ws/rest/RestClient.java +++ b/src/jalview/ws/rest/RestClient.java @@ -1,52 +1,55 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) - * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.ws.rest; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.Collection; -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; import jalview.gui.AlignViewport; import jalview.gui.AlignmentPanel; import jalview.gui.Desktop; +import jalview.gui.JvOptionPane; 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.event.MenuEvent; +import javax.swing.event.MenuListener; + /** * @author JimP * */ -public class RestClient extends WSClient implements WSClientI, - WSMenuEntryProviderI +public class RestClient extends WSClient + implements WSClientI, WSMenuEntryProviderI { RestServiceDescription service; @@ -77,16 +80,26 @@ public class RestClient extends WSClient implements WSClientI, public RestClient(RestServiceDescription service2, AlignFrame alignFrame) { + this(service2, alignFrame, false); + } + + boolean headless = false; + + public RestClient(RestServiceDescription service2, AlignFrame alignFrame, + boolean nogui) + { service = service2; af = alignFrame; av = alignFrame.getViewport(); + headless = nogui; constructJob(); } 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) @@ -95,8 +108,8 @@ public class RestClient extends WSClient implements WSClientI, } if (!headless) { - wsInfo = new WebserviceInfo(WebServiceJobTitle, WebServiceName + "\n" - + WebServiceReference); + wsInfo = new WebserviceInfo(WebServiceJobTitle, + WebServiceName + "\n" + WebServiceReference, true); wsInfo.setRenderAsHtml(true); } @@ -129,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() { @@ -245,40 +259,58 @@ public class RestClient extends WSClient implements WSClientI, { // intersect groups with selected region _input = new AlignmentView(av.getAlignment(), - av.getColumnSelection(), av.getSelectionGroup(), - av.hasHiddenColumns(), true, true); - viewTitle = "selected " - + (av.hasHiddenColumns() ? "visible" : "") - + " region of " + af.getTitle(); + av.getAlignment().getHiddenColumns(), + av.getSelectionGroup(), av.hasHiddenColumns(), true, + true); + viewTitle = MessageManager.formatMessage( + "label.select_visible_region_of", new String[] + { (av.hasHiddenColumns() + ? MessageManager.getString("label.visible") + : ""), + af.getTitle() }); } else { // use selected region to partition alignment _input = new AlignmentView(av.getAlignment(), - av.getColumnSelection(), av.getSelectionGroup(), - av.hasHiddenColumns(), false, true); + av.getAlignment().getHiddenColumns(), + 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 { // just take selected region intersection _input = new AlignmentView(av.getAlignment(), - av.getColumnSelection(), av.getSelectionGroup(), - av.hasHiddenColumns(), true, true); - viewTitle = "selected " + (av.hasHiddenColumns() ? "visible" : "") - + " region of " + af.getTitle(); + av.getAlignment().getHiddenColumns(), + av.getSelectionGroup(), av.hasHiddenColumns(), true, true); + viewTitle = MessageManager.formatMessage( + "label.select_visible_region_of", new String[] + { (av.hasHiddenColumns() + ? MessageManager.getString("label.visible") + : ""), + af.getTitle() }); } } else { // standard alignment view without selection present _input = new AlignmentView(av.getAlignment(), - av.getColumnSelection(), null, av.hasHiddenColumns(), false, - true); - viewTitle = "" + (av.hasHiddenColumns() ? "visible region of " : "") + av.getAlignment().getHiddenColumns(), null, + av.hasHiddenColumns(), false, true); + viewTitle = "" + + (av.hasHiddenColumns() + ? (new StringBuffer(" ") + .append(MessageManager + .getString("label.visible_region_of")) + .toString()) + : "") + af.getTitle(); } @@ -286,27 +318,32 @@ public class RestClient extends WSClient implements WSClientI, if (jobsthread.isValid()) { - setWebserviceInfo(false); - wsInfo.setthisService(this); - jobsthread.setWebServiceInfo(wsInfo); + setWebserviceInfo(headless); + if (!headless) + { + wsInfo.setthisService(this); + jobsthread.setWebServiceInfo(wsInfo); + } jobsthread.start(); } else { // TODO: try to tell the user why the job couldn't be started. - JOptionPane - .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", - JOptionPane.WARNING_MESSAGE); + JvOptionPane.showMessageDialog(Desktop.getDesktopPane(), + (jobsthread.hasWarnings() ? jobsthread.getWarnings() + : MessageManager.getString( + "label.job_couldnt_be_started_check_input")), + MessageManager + .getString("label.unable_start_web_service_analysis"), + JvOptionPane.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"); @@ -333,11 +370,9 @@ public class RestClient extends WSClient implements WSClientI, iparams.put("groups", sgroups); sgroups.token = "groups"; sgroups.sep = " "; - RestServiceDescription shmrService = new RestServiceDescription( - action, - description, - name, - "http://zeus.few.vu.nl/programs/shmrwww/index.php?tool=jalview",// ?tool=jalview&mbjob[method]=shmr&mbjob[description]=step1", + RestServiceDescription shmrService = new RestServiceDescription(action, + description, name, + "http://zeus.few.vu.nl/programs/shmrwww/index.php?tool=jalview", // ?tool=jalview&mbjob[method]=shmr&mbjob[description]=step1", "?tool=jalview", iparams, true, false, '-'); // a priori knowledge of the data returned from the service shmrService.addResultDatatype(JvDataType.ANNOTATION); @@ -376,16 +411,16 @@ public class RestClient extends WSClient implements WSClientI, try { for (RestServiceDescription descr : RestServiceDescription - .parseDescriptions(jalview.bin.Cache.getDefault( - RSBS_SERVICES, - makeShmmrRestClient().service.toString()))) + .parseDescriptions( + jalview.bin.Cache.getDefault(RSBS_SERVICES, + makeShmmrRestClient().service.toString()))) { services.add(descr.toString()); } } catch (Exception ex) { - System.err - .println("Serious - RSBS descriptions in user preferences are corrupt!"); + System.err.println( + "Serious - RSBS descriptions in user preferences are corrupt!"); ex.printStackTrace(); } @@ -399,33 +434,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;