X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJWs2Job.java;h=7d59effd05b8cf0e0f712a0b3fea98729d799ff7;hb=59d682209891099d46b960509907c79e3fb276fe;hp=4bf97a367971732635563afc1b327e8e9e56d566;hpb=39c0b5e5d2ff4352d36bb6705121dc5ed14ba81b;p=jalview.git

diff --git a/src/jalview/ws/jws2/JWs2Job.java b/src/jalview/ws/jws2/JWs2Job.java
index 4bf97a3..7d59eff 100644
--- a/src/jalview/ws/jws2/JWs2Job.java
+++ b/src/jalview/ws/jws2/JWs2Job.java
@@ -1,5 +1,19 @@
-/**
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, 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.jws2;
 
@@ -8,20 +22,24 @@ import compbio.metadata.JobStatus;
 import jalview.ws.AWsJob;
 
 /**
- * job status processing for JWS2 jobs. 
+ * job status processing for JWS2 jobs.
+ * 
  * @author JimP
- *
+ * 
  */
 public abstract class JWs2Job extends AWsJob
 {
-  JobStatus status=null;
+  JobStatus status = null;
+
   public void setjobStatus(JobStatus jobStatus)
   {
     status = jobStatus;
     // update flags
   }
 
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see jalview.ws.AWsJob#clearResponse()
    */
   @Override
@@ -30,97 +48,111 @@ public abstract class JWs2Job extends AWsJob
     status = null;
   }
 
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see jalview.ws.AWsJob#getState()
    */
   @Override
   public String getState()
   {
-    return status==null ? ("Unknown") : status.toString();
+    return status == null ? ("Unknown") : status.toString();
   }
-  /* (non-Javadoc)
+
+  /*
+   * (non-Javadoc)
+   * 
    * @see jalview.ws.AWsJob#hasResponse()
    */
   @Override
   public boolean hasResponse()
   {
     // TODO Auto-generated method stub
-    return status!=null;
+    return status != null;
   }
+
   /*
-  StringBuffer statusBuffer = null;
-  * (non-Javadoc)
-  * @see jalview.ws.AWsJob#getStatus()
-   *
-  @Override
-  public String getStatus()
-  {
-    return statusBuffer.toString();
-  }
-  * (non-Javadoc)
+   * StringBuffer statusBuffer = null; (non-Javadoc)
+   * 
+   * @see jalview.ws.AWsJob#getStatus()
+   * 
+   * @Override public String getStatus() { return statusBuffer.toString(); }
+   * (non-Javadoc)
+   * 
    * @see jalview.ws.AWsJob#hasStatus()
-   *
-  @Override
-  public boolean hasStatus()
-  {
-    return statusBuffer!=null;
-  }
-*/
+   * 
+   * @Override public boolean hasStatus() { return statusBuffer!=null; }
+   */
 
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see jalview.ws.AWsJob#isBroken()
    */
   @Override
   public boolean isBroken()
   {
-    return status.equals(status.UNDEFINED);
+    return status == null ? false : status.equals(status.UNDEFINED);
   }
 
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see jalview.ws.AWsJob#isFailed()
    */
   @Override
   public boolean isFailed()
   {
-    return status.equals(status.FAILED);
+    return status == null ? false : status.equals(status.FAILED);
   }
 
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see jalview.ws.AWsJob#isFinished()
    */
   @Override
   public boolean isFinished()
   {
-    return status.equals(status.FINISHED);
+    return status == null ? false : status.equals(status.FINISHED);
   }
 
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see jalview.ws.AWsJob#isQueued()
    */
   @Override
   public boolean isQueued()
   {
-    return status.equals(status.SUBMITTED) || status.equals(status.PENDING);
+    return status == null ? false : status.equals(status.SUBMITTED)
+            || status.equals(status.PENDING);
   }
 
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see jalview.ws.AWsJob#isRunning()
    */
   @Override
   public boolean isRunning()
   {
     // TODO Auto-generated method stub
-    return status.equals(status.RUNNING) || status.equals(status.STARTED);
+    return status != null
+            && (status.equals(status.RUNNING) || status
+                    .equals(status.STARTED));
   }
 
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see jalview.ws.AWsJob#isServerError()
    */
   @Override
   public boolean isServerError()
   {
-    // server errors are raised as exceptions on the service method calls.  
-    return false; // status.equals(status.FAILED);
+    // server errors are raised as exceptions on the service method calls.
+    return status == null ? false : false; // status.equals(status.FAILED);
   }
 
 }