Merge branch 'releases/Release_2_11_3_Branch'

[jalview.git] / src / uk / ac / ebi / picr / model / CrossReference.java

diff --git a/src/uk/ac/ebi/picr/model/CrossReference.java b/src/uk/ac/ebi/picr/model/CrossReference.java
index 826e6c1..fbb654a 100644 (file)
--- a/src/uk/ac/ebi/picr/model/CrossReference.java
+++ b/src/uk/ac/ebi/picr/model/CrossReference.java
@@ -1,19 +1,21 @@
 /*
- * 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.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package uk.ac.ebi.picr.model;
@@ -242,15 +244,22 @@ public class CrossReference 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 CrossReference))
+    {
       return false;
+    }
     CrossReference other = (CrossReference) obj;
-    if (obj == null)
-      return false;
     if (this == obj)
+    {
       return true;
+    }
     if (__equalsCalc != null)
     {
       return (__equalsCalc == obj);
@@ -258,31 +267,46 @@ public class CrossReference implements java.io.Serializable
     __equalsCalc = obj;
     boolean _equals;
     _equals = true
-            && ((this.accession == null && other.getAccession() == null) || (this.accession != null && this.accession
-                    .equals(other.getAccession())))
-            && ((this.accessionVersion == null && other
-                    .getAccessionVersion() == null) || (this.accessionVersion != null && this.accessionVersion
-                    .equals(other.getAccessionVersion())))
-            && ((this.databaseDescription == null && other
-                    .getDatabaseDescription() == null) || (this.databaseDescription != null && this.databaseDescription
-                    .equals(other.getDatabaseDescription())))
-            && ((this.databaseName == null && other.getDatabaseName() == null) || (this.databaseName != null && this.databaseName
-                    .equals(other.getDatabaseName())))
-            && ((this.dateAdded == null && other.getDateAdded() == null) || (this.dateAdded != null && this.dateAdded
-                    .equals(other.getDateAdded())))
-            && ((this.dateDeleted == null && other.getDateDeleted() == null) || (this.dateDeleted != null && this.dateDeleted
-                    .equals(other.getDateDeleted())))
+            && ((this.accession == null && other.getAccession() == null)
+                    || (this.accession != null
+                            && this.accession.equals(other.getAccession())))
+            && ((this.accessionVersion == null
+                    && other.getAccessionVersion() == null)
+                    || (this.accessionVersion != null
+                            && this.accessionVersion
+                                    .equals(other.getAccessionVersion())))
+            && ((this.databaseDescription == null
+                    && other.getDatabaseDescription() == null)
+                    || (this.databaseDescription != null
+                            && this.databaseDescription.equals(
+                                    other.getDatabaseDescription())))
+            && ((this.databaseName == null
+                    && other.getDatabaseName() == null)
+                    || (this.databaseName != null && this.databaseName
+                            .equals(other.getDatabaseName())))
+            && ((this.dateAdded == null && other.getDateAdded() == null)
+                    || (this.dateAdded != null
+                            && this.dateAdded.equals(other.getDateAdded())))
+            && ((this.dateDeleted == null && other.getDateDeleted() == null)
+                    || (this.dateDeleted != null && this.dateDeleted
+                            .equals(other.getDateDeleted())))
             && this.deleted == other.isDeleted()
-            && ((this.gi == null && other.getGi() == null) || (this.gi != null && this.gi
-                    .equals(other.getGi())))
-            && ((this.taxonId == null && other.getTaxonId() == null) || (this.taxonId != null && this.taxonId
-                    .equals(other.getTaxonId())));
+            && ((this.gi == null && other.getGi() == null)
+                    || (this.gi != null && this.gi.equals(other.getGi())))
+            && ((this.taxonId == null && other.getTaxonId() == null)
+                    || (this.taxonId != null
+                            && this.taxonId.equals(other.getTaxonId())));
     __equalsCalc = null;
     return _equals;
   }
 
   private boolean __hashCodeCalc = false;
 
+  /**
+   * hashCode designed to ensure that if two instances satisfy o1.equals(o2)
+   * then they have the same hashcode.
+   */
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)