JAL-3438 spotless for 2.11.2.0

[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..e4b760b 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;
@@ -99,17 +100,18 @@ public class Msfalignment implements java.io.Serializable
     }
     __equalsCalc = obj;
     boolean _equals;
-    _equals = true
-            && ((this.msf == null && other.getMsf() == null) || (this.msf != null && this.msf
-                    .equals(other.getMsf())))
-            && ((this.notes == null && other.getNotes() == null) || (this.notes != null && this.notes
-                    .equals(other.getNotes())));
+    _equals = true && ((this.msf == null && other.getMsf() == null)
+            || (this.msf != null && this.msf.equals(other.getMsf())))
+            && ((this.notes == null && other.getNotes() == null)
+                    || (this.notes != null
+                            && this.notes.equals(other.getNotes())));
     __equalsCalc = null;
     return _equals;
   }
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)