JAL-3438 spotless for 2.11.2.0

[jalview.git] / src / vamsas / objects / simple / Result.java

diff --git a/src/vamsas/objects/simple/Result.java b/src/vamsas/objects/simple/Result.java
index 60ede6f..170a1b5 100755 (executable)
--- a/src/vamsas/objects/simple/Result.java
+++ b/src/vamsas/objects/simple/Result.java
@@ -1,19 +1,21 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * 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 vamsas.objects.simple;
@@ -286,23 +288,29 @@ public class Result implements java.io.Serializable
 
   private java.lang.Object __equalsCalc = null;
 
+  @Override
   public synchronized boolean equals(java.lang.Object obj)
   {
+    if (obj == null)
+    {
+      return false;
+    }
     if (!(obj instanceof Result))
+    {
       return false;
+    }
     Result other = (Result) obj;
-    if (obj == null)
-      return false;
     if (this == obj)
+    {
       return true;
+    }
     if (__equalsCalc != null)
     {
       return (__equalsCalc == obj);
     }
     __equalsCalc = obj;
     boolean _equals;
-    _equals = true
-            && this.broken == other.isBroken()
+    _equals = true && this.broken == other.isBroken()
             && this.failed == other.isFailed()
             && this.finished == other.isFinished()
             && this.invalid == other.isInvalid()
@@ -311,8 +319,9 @@ public class Result implements java.io.Serializable
             && this.running == other.isRunning()
             && this.serverError == other.isServerError()
             && this.state == other.getState()
-            && ((this.status == null && other.getStatus() == null) || (this.status != null && this.status
-                    .equals(other.getStatus())))
+            && ((this.status == null && other.getStatus() == null)
+                    || (this.status != null
+                            && this.status.equals(other.getStatus())))
             && this.suspended == other.isSuspended();
     __equalsCalc = null;
     return _equals;
@@ -320,6 +329,7 @@ public class Result implements java.io.Serializable
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)