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

[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 18293f5..87f0a48 100755 (executable)
--- a/src/vamsas/objects/simple/Result.java
+++ b/src/vamsas/objects/simple/Result.java
@@ -288,15 +288,22 @@ 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);
@@ -322,6 +329,7 @@ public class Result implements java.io.Serializable
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)