X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJws2Client.java;h=a9ca8f0009823ae2c650456310640e0059983160;hb=a9514dd266ef856c485fd8f9108a3797b87add3f;hp=d44be01c46fe6d05aa12f5ba5e2d6e3307715c2c;hpb=39c0b5e5d2ff4352d36bb6705121dc5ed14ba81b;p=jalview.git diff --git a/src/jalview/ws/jws2/Jws2Client.java b/src/jalview/ws/jws2/Jws2Client.java index d44be01..a9ca8f0 100644 --- a/src/jalview/ws/jws2/Jws2Client.java +++ b/src/jalview/ws/jws2/Jws2Client.java @@ -1,3 +1,20 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) + * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * + * 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. + * + * 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 . + */ package jalview.ws.jws2; import javax.swing.JMenu; @@ -19,7 +36,7 @@ public abstract class Jws2Client extends jalview.ws.WSClient // serviceHandle = serv; String serviceInstance = serv.service.getClass().getName(); WebServiceName = serv.serviceType; - WebServiceJobTitle = serv.serviceType; + WebServiceJobTitle = serv.getActionText(); WsURL = serv.hosturl; if (!b) { @@ -28,27 +45,26 @@ public abstract class Jws2Client extends jalview.ws.WSClient } return null; } + /* - Jws2Instance serviceHandle; - * (non-Javadoc) - * @see jalview.ws.WSMenuEntryProviderI#attachWSMenuEntry(javax.swing.JMenu, jalview.gui.AlignFrame) - * - @Override - public void attachWSMenuEntry(JMenu wsmenu, AlignFrame alignFrame) - { - if (serviceHandle==null) - { - throw new Error("Implementation error: No service handle for this Jws2 service."); - } - attachWSMenuEntry(wsmenu, serviceHandle, alignFrame); - }*/ + * Jws2Instance serviceHandle; (non-Javadoc) + * + * @see jalview.ws.WSMenuEntryProviderI#attachWSMenuEntry(javax.swing.JMenu, + * jalview.gui.AlignFrame) + * + * @Override public void attachWSMenuEntry(JMenu wsmenu, AlignFrame + * alignFrame) { if (serviceHandle==null) { throw new + * Error("Implementation error: No service handle for this Jws2 service."); } + * attachWSMenuEntry(wsmenu, serviceHandle, alignFrame); } + */ /** * add the menu item for a particular jws2 service instance + * * @param wsmenu * @param service * @param alignFrame */ - abstract void attachWSMenuEntry(JMenu wsmenu, - final Jws2Instance service, final AlignFrame alignFrame); + abstract void attachWSMenuEntry(JMenu wsmenu, final Jws2Instance service, + final AlignFrame alignFrame); }