JAL-4090 blocker patch JAL-3772 tidy up groovy console when closed rather than callin...

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

diff --git a/src/vamsas/objects/simple/Sequence.java b/src/vamsas/objects/simple/Sequence.java
index 52770ad..0615c39 100755 (executable)
--- a/src/vamsas/objects/simple/Sequence.java
+++ b/src/vamsas/objects/simple/Sequence.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * 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.
  * 
@@ -78,15 +78,22 @@ public class Sequence implements java.io.Serializable
 
   private java.lang.Object __equalsCalc = null;
 
+  @Override
   public synchronized boolean equals(java.lang.Object obj)
   {
+    if (obj == null)
+    {
+      return false;
+    }
     if (!(obj instanceof Sequence))
+    {
       return false;
+    }
     Sequence other = (Sequence) obj;
-    if (obj == null)
-      return false;
     if (this == obj)
+    {
       return true;
+    }
     if (__equalsCalc != null)
     {
       return (__equalsCalc == obj);
@@ -94,16 +101,18 @@ public class Sequence implements java.io.Serializable
     __equalsCalc = obj;
     boolean _equals;
     _equals = true
-            && ((this.id == null && other.getId() == null) || (this.id != null && this.id
-                    .equals(other.getId())))
-            && ((this.seq == null && other.getSeq() == null) || (this.seq != null && this.seq
-                    .equals(other.getSeq())));
+            && ((this.id == null && other.getId() == null)
+                    || (this.id != null && this.id.equals(other.getId())))
+            && ((this.seq == null && other.getSeq() == null)
+                    || (this.seq != null
+                            && this.seq.equals(other.getSeq())));
     __equalsCalc = null;
     return _equals;
   }
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)