X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FWSClient.java;h=3f10686b60abb3c033aa8eddc23bdd4a8a7e444a;hb=a45774ee31d9f35d4eff46d54d7deab719afb092;hp=29a8b9244cc1240ca3adde2aa5851df1595a06b6;hpb=6652334084a8900307745466b3188c86616793fa;p=jalview.git

diff --git a/src/jalview/ws/WSClient.java b/src/jalview/ws/WSClient.java
index 29a8b92..3f10686 100755
--- a/src/jalview/ws/WSClient.java
+++ b/src/jalview/ws/WSClient.java
@@ -1,56 +1,62 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program 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 2
- * of the License, or (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 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 <http://www.gnu.org/licenses/>.
  */
 package jalview.ws;
 
-import ext.vamsas.*;
 import jalview.gui.*;
 
-public class WSClient
+public abstract class WSClient // implements WSMenuEntryProviderI
 {
   /**
-   * WSClient holds the basic attributes that are displayed to the user
-   * for all jalview web service clients
+   * WSClient holds the basic attributes that are displayed to the user for all
+   * jalview web service clients
    */
   /**
    * displayed name for this web service
    */
   protected String WebServiceName;
+
   /**
-   * specific job title (e.g. 'ClustalW Alignment of Selection from Aligment from Cut and Paste input')
+   * specific job title (e.g. 'ClustalW Alignment of Selection from Aligment
+   * from Cut and Paste input')
    */
   protected String WebServiceJobTitle;
+
   /**
-   * String giving additional information such as method citations for this service 
+   * String giving additional information such as method citations for this
+   * service
    */
   protected String WebServiceReference;
+
   /**
    * Service endpoint
    */
   protected String WsURL;
+
   /**
    * Web service information used to initialise the WSClient attributes
    */
   protected WebserviceInfo wsInfo;
+
   /**
-   * total number of jobs managed by this web service client instance. 
+   * total number of jobs managed by this web service client instance.
    */
   int jobsRunning = 0;
+
   /**
    * TODO: this is really service metadata, and should be moved elsewhere.
    * mappings between abstract interface names and menu entries
@@ -61,45 +67,8 @@ public class WSClient
     ServiceActions.put("MsaWS", "Multiple Sequence Alignment");
     ServiceActions.put("SecStrPred", "Secondary Structure Prediction");
   };
+
   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);
-  }
-    /**
-     * 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;
-  }
 }