jalview 2.5 release banner

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

diff --git a/src/jalview/ws/WSThread.java b/src/jalview/ws/WSThread.java
index 03cfba7..65c1c96 100644 (file)
--- a/src/jalview/ws/WSThread.java
+++ b/src/jalview/ws/WSThread.java
@@ -1,20 +1,19 @@
 /*\r
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)\r
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)\r
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle\r
  * \r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
+ * This file is part of Jalview.\r
  * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
+ * Jalview is free software: you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License \r
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\r
  * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
+ * Jalview is distributed in the hope that it will be useful, but \r
+ * WITHOUT ANY WARRANTY; without even the implied warranty \r
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR \r
+ * PURPOSE.  See the GNU General Public License for more details.\r
+ * \r
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.\r
  */\r
 package jalview.ws;\r
 \r
@@ -240,13 +239,13 @@ public abstract class WSThread extends Thread
   String WsUrl = null;\r
 \r
   /**\r
-   * query web service for status of job. on return, job.result must not be null -\r
-   * if it is then it will be assumed that the job status query timed out and a\r
-   * server exception will be logged.\r
+   * query web service for status of job. on return, job.result must not be null\r
+   * - if it is then it will be assumed that the job status query timed out and\r
+   * a server exception will be logged.\r
    * \r
    * @param job\r
    * @throws Exception\r
-   *                 will be logged as a server exception for this job\r
+   *           will be logged as a server exception for this job\r
    */\r
   abstract void pollJob(WSJob job) throws Exception;\r
 \r
@@ -416,15 +415,15 @@ public abstract class WSThread extends Thread
   /**\r
    * \r
    * @param alignFrame\r
-   *                reference for copying mappings across\r
+   *          reference for copying mappings across\r
    * @param wsInfo\r
-   *                gui attachment point\r
+   *          gui attachment point\r
    * @param input\r
-   *                input data for the calculation\r
+   *          input data for the calculation\r
    * @param webServiceName\r
-   *                name of service\r
+   *          name of service\r
    * @param wsUrl\r
-   *                url of the service being invoked\r
+   *          url of the service being invoked\r
    */\r
   public WSThread(AlignFrame alignFrame, WebserviceInfo wsinfo,\r
           AlignmentView input, String webServiceName, String wsUrl)\r
@@ -446,14 +445,14 @@ public abstract class WSThread extends Thread
 \r
   /**\r
    * \r
-   * @param alframe -\r
-   *                reference for copying mappings and display styles across\r
-   * @param wsinfo2 -\r
-   *                gui attachment point\r
-   * @param alview -\r
-   *                input data for the calculation\r
-   * @param wsurl2 -\r
-   *                url of the service being invoked\r
+   * @param alframe\r
+   *          - reference for copying mappings and display styles across\r
+   * @param wsinfo2\r
+   *          - gui attachment point\r
+   * @param alview\r
+   *          - input data for the calculation\r
+   * @param wsurl2\r
+   *          - url of the service being invoked\r
    */\r
   public WSThread(AlignFrame alframe, WebserviceInfo wsinfo2,\r
           AlignmentView alview, String wsurl2)\r