First patch for * JAL-493

[jalview.git] / src / jalview / ws / WSClient.java

diff --git a/src/jalview/ws/WSClient.java b/src/jalview/ws/WSClient.java
index 1490da1..4a5c7dd 100755 (executable)
--- a/src/jalview/ws/WSClient.java
+++ b/src/jalview/ws/WSClient.java
@@ -17,12 +17,10 @@
  */
 package jalview.ws;
 
-import javax.swing.JMenu;
 
-import ext.vamsas.*;
 import jalview.gui.*;
 
-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 +72,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);
 }