JAL-3438 spotless for 2.11.2.0

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

diff --git a/src/vamsas/objects/simple/MsaResult.java b/src/vamsas/objects/simple/MsaResult.java
index a142820..31ab02f 100755 (executable)
--- a/src/vamsas/objects/simple/MsaResult.java
+++ b/src/vamsas/objects/simple/MsaResult.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,8 +20,8 @@
  */
 package vamsas.objects.simple;
 
-public class MsaResult extends vamsas.objects.simple.Result implements
-        java.io.Serializable
+public class MsaResult extends vamsas.objects.simple.Result
+        implements java.io.Serializable
 {
   private vamsas.objects.simple.Alignment msa;
 
@@ -58,20 +58,20 @@ public class MsaResult extends vamsas.objects.simple.Result implements
     this.msa = msa;
   }
 
+  @Override
   public synchronized boolean equals(java.lang.Object obj)
   {
-    if (!(obj instanceof MsaResult))
+    if (obj == null)
     {
       return false;
     }
-
-    MsaResult other = (MsaResult) obj;
-
-    if (obj == null)
+    if (!(obj instanceof MsaResult))
     {
       return false;
     }
 
+    MsaResult other = (MsaResult) obj;
+
     if (this == obj)
     {
       return true;
@@ -85,14 +85,15 @@ public class MsaResult extends vamsas.objects.simple.Result implements
     __equalsCalc = obj;
 
     boolean _equals;
-    _equals = super.equals(obj)
-            && (((this.msa == null) && (other.getMsa() == null)) || ((this.msa != null) && this.msa
-                    .equals(other.getMsa())));
+    _equals = super.equals(obj) && (((this.msa == null)
+            && (other.getMsa() == null))
+            || ((this.msa != null) && this.msa.equals(other.getMsa())));
     __equalsCalc = null;
 
     return _equals;
   }
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)