Merge develop to Release_2_8_3_Branch

[jalview.git] / src / uk / ac / ebi / picr / model / UPEntry.java

diff --git a/src/uk/ac/ebi/picr/model/UPEntry.java b/src/uk/ac/ebi/picr/model/UPEntry.java
index 0390d48..c94bf15 100644 (file)
--- a/src/uk/ac/ebi/picr/model/UPEntry.java
+++ b/src/uk/ac/ebi/picr/model/UPEntry.java
@@ -198,15 +198,22 @@ public class UPEntry 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 UPEntry))
+    {
       return false;
+    }
     UPEntry other = (UPEntry) obj;
-    if (obj == null)
-      return false;
     if (this == obj)
+    {
       return true;
+    }
     if (__equalsCalc != null)
     {
       return (__equalsCalc == obj);
@@ -236,6 +243,7 @@ public class UPEntry implements java.io.Serializable
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)