X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fuk%2Fac%2Febi%2Fpicr%2Fmodel%2FCrossReference.java;fp=src%2Fuk%2Fac%2Febi%2Fpicr%2Fmodel%2FCrossReference.java;h=fbb654a5a6aaf14a62025b974d06cfb455c8c14b;hb=3459a8a691cb22508d7067f240b7254e588e77d3;hp=498a47b6983311ac5cdde9991b4192bfc5900642;hpb=5b27f1062b2203c4c31702e205f4c78e1992063e;p=jalview.git

diff --git a/src/uk/ac/ebi/picr/model/CrossReference.java b/src/uk/ac/ebi/picr/model/CrossReference.java
index 498a47b..fbb654a 100644
--- a/src/uk/ac/ebi/picr/model/CrossReference.java
+++ b/src/uk/ac/ebi/picr/model/CrossReference.java
@@ -267,25 +267,35 @@ 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;
   }