X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2FWSClient.java;h=0f5cee868d73bfec6c9fa55978e2fafba4975cb1;hb=bc1a3842b31a35a7794f4afec4911ad421c7c3e4;hp=1490da17544281d605510eb2bc5cc4acc444dcd4;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git
diff --git a/src/jalview/ws/WSClient.java b/src/jalview/ws/WSClient.java
index 1490da1..0f5cee8 100755
--- a/src/jalview/ws/WSClient.java
+++ b/src/jalview/ws/WSClient.java
@@ -1,28 +1,28 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, 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;
-import javax.swing.JMenu;
-
-import ext.vamsas.*;
-import jalview.gui.*;
+import jalview.gui.WebserviceInfo;
-public abstract class WSClient implements WSMenuEntryProviderI
+public abstract class WSClient // implements WSMenuEntryProviderI
{
/**
* WSClient holds the basic attributes that are displayed to the user for all
@@ -74,86 +74,4 @@ public abstract class WSClient implements WSMenuEntryProviderI
public WSClient()
{
}
-
- /**
- * initialise WSClient service information attributes from the service handle
- *
- * @param sh
- * @return the service instance information GUI for this client and job.
- */
- protected WebserviceInfo setWebService(ServiceHandle sh)
- {
- return setWebService(sh, false);
- }
-
- /**
- * original service handle that this client was derived from
- */
- ServiceHandle serviceHandle = null;
-
- /**
- * initialise WSClient service information attributes from the service handle
- *
- * @param sh
- * @param headless
- * true implies no GUI objects will be created.
- * @return the service instance information GUI for this client and job.
- */
- protected WebserviceInfo setWebService(ServiceHandle sh, boolean headless)
- {
- WebServiceName = sh.getName();
- if (ServiceActions.containsKey(sh.getAbstractName()))
- {
- WebServiceJobTitle = sh.getName(); // TODO: control sh.Name specification
- // properly
- // add this for short names. +(String)
- // ServiceActions.get(sh.getAbstractName());
- }
- else
- {
- WebServiceJobTitle = sh.getAbstractName() + " using " + sh.getName();
-
- }
- WebServiceReference = sh.getDescription();
- WsURL = sh.getEndpointURL();
- WebserviceInfo wsInfo = null;
- if (!headless)
- {
- wsInfo = new WebserviceInfo(WebServiceJobTitle, WebServiceReference);
- }
- return wsInfo;
- }
-
- /**
- * convenience method to pass the serviceHandle reference that instantiated
- * this service on to the menu entry constructor
- *
- * @param wsmenu
- * the menu to which any menu entries/sub menus are to be attached
- * @param alignFrame
- * the alignFrame instance that provides input data for the service
- */
- public void attachWSMenuEntry(JMenu wsmenu, final AlignFrame alignFrame)
- {
- if (serviceHandle == null)
- {
- throw new Error(
- "IMPLEMENTATION ERROR: cannot attach WS Menu Entry without service handle reference!");
- }
- attachWSMenuEntry(wsmenu, serviceHandle, alignFrame);
- }
-
- /**
- * method implemented by each WSClient implementation that creates menu
- * entries that enact their service using data from alignFrame.
- *
- * @param wsmenu
- * where new menu entries (and submenus) are to be attached
- * @param serviceHandle
- * the serviceHandle document for the service that entries are
- * created for
- * @param alignFrame
- */
- public abstract void attachWSMenuEntry(JMenu wsmenu,
- final ServiceHandle serviceHandle, final AlignFrame alignFrame);
}