X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FAWSThread.java;h=0167690aa3db669b5dc359e14792c4eed3f691f7;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=11556b253c6385b9cc7f0492cef8ee4c05686300;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git

diff --git a/src/jalview/ws/AWSThread.java b/src/jalview/ws/AWSThread.java
index 11556b2..0167690 100644
--- a/src/jalview/ws/AWSThread.java
+++ b/src/jalview/ws/AWSThread.java
@@ -1,19 +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
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 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.
- * 
+ *  
  * 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/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.ws;
 
@@ -34,47 +35,57 @@ public abstract class AWSThread extends Thread
    * view that this job was associated with
    */
   protected AlignmentI currentView = null;
+
   /**
    * feature settings from view that job was associated with
    */
   protected FeatureRendererSettings featureSettings = null;
+
   /**
    * metadata about this web service
    */
   protected WebserviceInfo wsInfo = null;
+
   /**
    * original input data for this job
    */
   protected AlignmentView input = null;
+
   /**
    * dataset sequence relationships to be propagated onto new results
    */
   protected AlignedCodonFrame[] codonframe = null;
+
   /**
    * are there jobs still running in this thread.
    */
   protected boolean jobComplete = false;
+
   /**
    * one or more jobs being managed by this thread.
    */
   protected AWsJob jobs[] = null;
+
   /**
    * full name of service
    */
   protected String WebServiceName = null;
+
   protected char defGapChar = '-';
+
   /**
    * header prepended to all output from job
    */
   protected String OutputHeader;
 
   /**
-   * only used when reporting a web service out of memory error - the job ID will be concatenated to the URL
+   * only used when reporting a web service out of memory error - the job ID
+   * will be concatenated to the URL
    */
   protected String WsUrl = null;
 
   /**
-   * generic web service job/subjob poll loop 
+   * generic web service job/subjob poll loop
    */
   public void run()
   {
@@ -153,30 +164,7 @@ public abstract class AWSThread extends Thread
         jstate.updateJobPanelState(wsInfo, OutputHeader, jobs[j]);
       }
       // Decide on overall state based on collected jobs[] states
-      if (jstate.running > 0)
-      {
-        wsInfo.setStatus(WebserviceInfo.STATE_RUNNING);
-      }
-      else if (jstate.queuing > 0)
-      {
-        wsInfo.setStatus(WebserviceInfo.STATE_QUEUING);
-      }
-      else
-      {
-        jobComplete = true;
-        if (jstate.finished > 0)
-        {
-          wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_OK);
-        }
-        else if (jstate.error > 0)
-        {
-          wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);
-        }
-        else if (jstate.serror > 0)
-        {
-          wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_SERVERERROR);
-        }
-      }
+      updateGlobalStatus(jstate);
       if (!jobComplete)
       {
         try
@@ -198,10 +186,39 @@ public abstract class AWSThread extends Thread
     {
       Cache.log
               .debug("WebServiceJob poll loop finished with no jobs created.");
+      wsInfo.setStatus(wsInfo.STATE_STOPPED_ERROR);
+      wsInfo.appendProgressText("No jobs ran.");
       wsInfo.setFinishedNoResults();
     }
   }
 
+  protected void updateGlobalStatus(JobStateSummary jstate)
+  {
+    if (jstate.running > 0)
+    {
+      wsInfo.setStatus(WebserviceInfo.STATE_RUNNING);
+    }
+    else if (jstate.queuing > 0)
+    {
+      wsInfo.setStatus(WebserviceInfo.STATE_QUEUING);
+    }
+    else
+    {
+      jobComplete = true;
+      if (jstate.finished > 0)
+      {
+        wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_OK);
+      }
+      else if (jstate.error > 0)
+      {
+        wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);
+      }
+      else if (jstate.serror > 0)
+      {
+        wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_SERVERERROR);
+      }
+    }
+  }
 
   public AWSThread()
   {
@@ -264,8 +281,8 @@ public abstract class AWSThread extends Thread
   /**
    * helper function to conserve dataset references to sequence objects returned
    * from web services 1. Propagates AlCodonFrame data from
-   * <code>codonframe</code> to <code>al</code>
-   * TODO: refactor to datamodel
+   * <code>codonframe</code> to <code>al</code> TODO: refactor to datamodel
+   * 
    * @param al
    */
   public void propagateDatasetMappings(Alignment al)
@@ -325,11 +342,12 @@ public abstract class AWSThread extends Thread
   }
 
   /**
+   * Extracts additional info from alignment view's context.
    * 
    * @param alframe
    *          - reference for copying mappings and display styles across
    * @param wsinfo2
-   *          - gui attachment point
+   *          - gui attachment point - may be null
    * @param alview
    *          - input data for the calculation
    * @param wsurl2