JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / src / jalview / ws / jws1 / WSJob.java

diff --git a/src/jalview/ws/jws1/WSJob.java b/src/jalview/ws/jws1/WSJob.java
index c2e1bf9..7531381 100644 (file)
--- a/src/jalview/ws/jws1/WSJob.java
+++ b/src/jalview/ws/jws1/WSJob.java
@@ -1,5 +1,22 @@
-/**
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.jws1;
 
@@ -7,7 +24,9 @@ import jalview.ws.AWsJob;
 
 abstract class WSJob extends AWsJob
 {
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see jalview.ws.AWsJob#clearResponse()
    */
   @Override
@@ -16,22 +35,26 @@ abstract class WSJob extends AWsJob
     result = null;
   }
 
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see jalview.ws.AWsJob#hasResponse()
    */
   @Override
   public boolean hasResponse()
   {
-    return result!=null;
+    return result != null;
   }
 
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see jalview.ws.AWsJob#hasStatus()
    */
   @Override
   public boolean hasStatus()
   {
-    return result!=null && result.getStatus()!=null;
+    return result != null && result.getStatus() != null;
   }
 
   /**
@@ -45,19 +68,21 @@ abstract class WSJob extends AWsJob
    */
   public String getStatus()
   {
-    return result==null ? null : result.getStatus();
+    return result == null ? null : result.getStatus();
   }
 
-  public String getState() {
-    return result==null ? "NULL result" : ""+result.getState(); 
+  public String getState()
+  {
+    return result == null ? "NULL result" : "" + result.getState();
   }
+
   /**
    * @return
    * @see vamsas.objects.simple.Result#isBroken()
    */
   public boolean isBroken()
   {
-    return result!=null && result.isBroken();
+    return result != null && result.isBroken();
   }
 
   /**
@@ -66,7 +91,7 @@ abstract class WSJob extends AWsJob
    */
   public boolean isFailed()
   {
-    return result!=null && result.isFailed();
+    return result != null && result.isFailed();
   }
 
   /**
@@ -75,7 +100,7 @@ abstract class WSJob extends AWsJob
    */
   public boolean isFinished()
   {
-    return result!=null && result.isFinished();
+    return result != null && result.isFinished();
   }
 
   /**
@@ -84,7 +109,7 @@ abstract class WSJob extends AWsJob
    */
   public boolean isInvalid()
   {
-    return result!=null && result.isInvalid();
+    return result != null && result.isInvalid();
   }
 
   /**
@@ -93,7 +118,7 @@ abstract class WSJob extends AWsJob
    */
   public boolean isJobFailed()
   {
-    return result!=null && result.isJobFailed();
+    return result != null && result.isJobFailed();
   }
 
   /**
@@ -102,7 +127,7 @@ abstract class WSJob extends AWsJob
    */
   public boolean isQueued()
   {
-    return result!=null && result.isQueued();
+    return result != null && result.isQueued();
   }
 
   /**
@@ -111,7 +136,7 @@ abstract class WSJob extends AWsJob
    */
   public boolean isRunning()
   {
-    return result!=null && result.isRunning();
+    return result != null && result.isRunning();
   }
 
   /**
@@ -120,6 +145,6 @@ abstract class WSJob extends AWsJob
    */
   public boolean isServerError()
   {
-    return result!=null && result.isServerError();
+    return result != null && result.isServerError();
   }
-}
\ No newline at end of file
+}