Merge develop to Release_2_8_3_Branch

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

diff --git a/src/vamsas/objects/simple/Msfalignment.java b/src/vamsas/objects/simple/Msfalignment.java
index 573eb96..90370f0 100755 (executable)
--- a/src/vamsas/objects/simple/Msfalignment.java
+++ b/src/vamsas/objects/simple/Msfalignment.java
@@ -78,17 +78,18 @@ public class Msfalignment implements java.io.Serializable
 
   private java.lang.Object __equalsCalc = null;
 
+  @Override
   public synchronized boolean equals(java.lang.Object obj)
   {
-    if (!(obj instanceof Msfalignment))
+    if (obj == null)
     {
       return false;
     }
-    Msfalignment other = (Msfalignment) obj;
-    if (obj == null)
+    if (!(obj instanceof Msfalignment))
     {
       return false;
     }
+    Msfalignment other = (Msfalignment) obj;
     if (this == obj)
     {
       return true;
@@ -110,6 +111,7 @@ public class Msfalignment implements java.io.Serializable
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)