Merge develop to Release_2_8_3_Branch

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

diff --git a/src/vamsas/objects/simple/JpredResult.java b/src/vamsas/objects/simple/JpredResult.java
index 9db8cfe..cc7cc67 100755 (executable)
--- a/src/vamsas/objects/simple/JpredResult.java
+++ b/src/vamsas/objects/simple/JpredResult.java
@@ -79,17 +79,18 @@ public class JpredResult extends vamsas.objects.simple.Result implements
 
   private java.lang.Object __equalsCalc = null;
 
+  @Override
   public synchronized boolean equals(java.lang.Object obj)
   {
-    if (!(obj instanceof JpredResult))
+    if (obj == null)
     {
       return false;
     }
-    JpredResult other = (JpredResult) obj;
-    if (obj == null)
+    if (!(obj instanceof JpredResult))
     {
       return false;
     }
+    JpredResult other = (JpredResult) obj;
     if (this == obj)
     {
       return true;
@@ -111,6 +112,7 @@ public class JpredResult extends vamsas.objects.simple.Result implements
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)