Merge develop to Release_2_8_3_Branch

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

diff --git a/src/vamsas/objects/simple/Object.java b/src/vamsas/objects/simple/Object.java
index 23eedec..7e79e6a 100755 (executable)
--- a/src/vamsas/objects/simple/Object.java
+++ b/src/vamsas/objects/simple/Object.java
@@ -29,15 +29,21 @@ public abstract class Object implements java.io.Serializable
 
   private java.lang.Object __equalsCalc = null;
 
+  @Override
   public synchronized boolean equals(java.lang.Object obj)
   {
-    if (!(obj instanceof Object))
-      return false;
-    Object other = (Object) obj;
     if (obj == null)
+    {
+      return false;
+    }
+    if (!(obj instanceof Object))
+    {
       return false;
+    }
     if (this == obj)
+    {
       return true;
+    }
     if (__equalsCalc != null)
     {
       return (__equalsCalc == obj);
@@ -51,6 +57,7 @@ public abstract class Object implements java.io.Serializable
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)