Merge branch 'features/JAL-4071_visibleFeaturesCounter' into features/JAL-3417_sdppre...

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

diff --git a/src/vamsas/objects/simple/SeqSearchResult.java b/src/vamsas/objects/simple/SeqSearchResult.java
index 0075416..04b6f70 100644 (file)
--- a/src/vamsas/objects/simple/SeqSearchResult.java
+++ b/src/vamsas/objects/simple/SeqSearchResult.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 SeqSearchResult extends vamsas.objects.simple.Result implements
-        java.io.Serializable
+public class SeqSearchResult extends vamsas.objects.simple.Result
+        implements java.io.Serializable
 {
   private vamsas.objects.simple.Alignment alignment;
 
@@ -127,15 +127,22 @@ public class SeqSearchResult extends vamsas.objects.simple.Result implements
 
   private java.lang.Object __equalsCalc = null;
 
+  @Override
   public synchronized boolean equals(java.lang.Object obj)
   {
+    if (obj == null)
+    {
+      return false;
+    }
     if (!(obj instanceof SeqSearchResult))
+    {
       return false;
+    }
     SeqSearchResult other = (SeqSearchResult) obj;
-    if (obj == null)
-      return false;
     if (this == obj)
+    {
       return true;
+    }
     if (__equalsCalc != null)
     {
       return (__equalsCalc == obj);
@@ -143,20 +150,25 @@ public class SeqSearchResult extends vamsas.objects.simple.Result implements
     __equalsCalc = obj;
     boolean _equals;
     _equals = super.equals(obj)
-            && ((this.alignment == null && other.getAlignment() == null) || (this.alignment != null && this.alignment
-                    .equals(other.getAlignment())))
-            && ((this.annotation == null && other.getAnnotation() == null) || (this.annotation != null && this.annotation
-                    .equals(other.getAnnotation())))
-            && ((this.features == null && other.getFeatures() == null) || (this.features != null && this.features
-                    .equals(other.getFeatures())))
-            && ((this.newickTree == null && other.getNewickTree() == null) || (this.newickTree != null && this.newickTree
-                    .equals(other.getNewickTree())));
+            && ((this.alignment == null && other.getAlignment() == null)
+                    || (this.alignment != null
+                            && this.alignment.equals(other.getAlignment())))
+            && ((this.annotation == null && other.getAnnotation() == null)
+                    || (this.annotation != null && this.annotation
+                            .equals(other.getAnnotation())))
+            && ((this.features == null && other.getFeatures() == null)
+                    || (this.features != null
+                            && this.features.equals(other.getFeatures())))
+            && ((this.newickTree == null && other.getNewickTree() == null)
+                    || (this.newickTree != null && this.newickTree
+                            .equals(other.getNewickTree())));
     __equalsCalc = null;
     return _equals;
   }
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)