JAL-629 Change all stdout and stderr output to use Console.outPrintln and Console...

[jalview.git] / src / jalview / ws / jws2 / JWs2Job.java

diff --git a/src/jalview/ws/jws2/JWs2Job.java b/src/jalview/ws/jws2/JWs2Job.java
index 683c58c..cd85d4a 100644 (file)
--- a/src/jalview/ws/jws2/JWs2Job.java
+++ b/src/jalview/ws/jws2/JWs2Job.java
@@ -1,27 +1,29 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * 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.
+ * 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/>.
+ * 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.jws2;
 
-import compbio.metadata.JobStatus;
-
 import jalview.ws.AWsJob;
 
+import compbio.metadata.JobStatus;
+
 /**
  * job status processing for JWS2 jobs.
  * 
@@ -126,8 +128,9 @@ public abstract class JWs2Job extends AWsJob
   @Override
   public boolean isQueued()
   {
-    return status == null ? false : status.equals(status.SUBMITTED)
-            || status.equals(status.PENDING);
+    return status == null ? false
+            : status.equals(status.SUBMITTED)
+                    || status.equals(status.PENDING);
   }
 
   /*
@@ -139,9 +142,8 @@ public abstract class JWs2Job extends AWsJob
   public boolean isRunning()
   {
     // TODO Auto-generated method stub
-    return status != null
-            && (status.equals(status.RUNNING) || status
-                    .equals(status.STARTED));
+    return status != null && (status.equals(status.RUNNING)
+            || status.equals(status.STARTED));
   }
 
   /*