Merge develop to Release_2_8_3_Branch

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

diff --git a/src/vamsas/objects/simple/Alignment.java b/src/vamsas/objects/simple/Alignment.java
index 9bff9cf..9d47b6a 100755 (executable)
--- a/src/vamsas/objects/simple/Alignment.java
+++ b/src/vamsas/objects/simple/Alignment.java
@@ -103,15 +103,22 @@ public class Alignment extends vamsas.objects.simple.Object implements
 
   private java.lang.Object __equalsCalc = null;
 
+  @Override
   public synchronized boolean equals(java.lang.Object obj)
   {
+    if (obj == null)
+    {
+      return false;
+    }
     if (!(obj instanceof Alignment))
+    {
       return false;
+    }
     Alignment other = (Alignment) obj;
-    if (obj == null)
-      return false;
     if (this == obj)
+    {
       return true;
+    }
     if (__equalsCalc != null)
     {
       return (__equalsCalc == obj);
@@ -131,6 +138,7 @@ public class Alignment extends vamsas.objects.simple.Object implements
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)