X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fuk%2Fac%2Febi%2Fpicr%2Fmodel%2FUPEntry.java;fp=src%2Fuk%2Fac%2Febi%2Fpicr%2Fmodel%2FUPEntry.java;h=9fe2f2fb7903fcd8ae204e291f79c7c139c46eb0;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=c94bf152c910d92802e06e7188732c75a5df65a6;hpb=49db0dff1da16c3355b43a41498c1fc93ef47e91;p=jalview.git diff --git a/src/uk/ac/ebi/picr/model/UPEntry.java b/src/uk/ac/ebi/picr/model/UPEntry.java index c94bf15..9fe2f2f 100644 --- a/src/uk/ac/ebi/picr/model/UPEntry.java +++ b/src/uk/ac/ebi/picr/model/UPEntry.java @@ -145,7 +145,8 @@ public class UPEntry implements java.io.Serializable this.logicalCrossReferences = logicalCrossReferences; } - public uk.ac.ebi.picr.model.CrossReference getLogicalCrossReferences(int i) + public uk.ac.ebi.picr.model.CrossReference getLogicalCrossReferences( + int i) { return this.logicalCrossReferences[i]; } @@ -220,23 +221,29 @@ public class UPEntry implements java.io.Serializable } __equalsCalc = obj; boolean _equals; - _equals = true - && ((this.CRC64 == null && other.getCRC64() == null) || (this.CRC64 != null && this.CRC64 - .equals(other.getCRC64()))) - && ((this.UPI == null && other.getUPI() == null) || (this.UPI != null && this.UPI - .equals(other.getUPI()))) - && ((this.identicalCrossReferences == null && other - .getIdenticalCrossReferences() == null) || (this.identicalCrossReferences != null && java.util.Arrays - .equals(this.identicalCrossReferences, - other.getIdenticalCrossReferences()))) - && ((this.logicalCrossReferences == null && other - .getLogicalCrossReferences() == null) || (this.logicalCrossReferences != null && java.util.Arrays - .equals(this.logicalCrossReferences, - other.getLogicalCrossReferences()))) - && ((this.sequence == null && other.getSequence() == null) || (this.sequence != null && this.sequence - .equals(other.getSequence()))) - && ((this.timestamp == null && other.getTimestamp() == null) || (this.timestamp != null && this.timestamp - .equals(other.getTimestamp()))); + _equals = true && ((this.CRC64 == null && other.getCRC64() == null) + || (this.CRC64 != null && this.CRC64.equals(other.getCRC64()))) + && ((this.UPI == null && other.getUPI() == null) + || (this.UPI != null + && this.UPI.equals(other.getUPI()))) + && ((this.identicalCrossReferences == null + && other.getIdenticalCrossReferences() == null) + || (this.identicalCrossReferences != null + && java.util.Arrays.equals( + this.identicalCrossReferences, + other.getIdenticalCrossReferences()))) + && ((this.logicalCrossReferences == null + && other.getLogicalCrossReferences() == null) + || (this.logicalCrossReferences != null + && java.util.Arrays.equals( + this.logicalCrossReferences, + other.getLogicalCrossReferences()))) + && ((this.sequence == null && other.getSequence() == null) + || (this.sequence != null + && this.sequence.equals(other.getSequence()))) + && ((this.timestamp == null && other.getTimestamp() == null) + || (this.timestamp != null && this.timestamp + .equals(other.getTimestamp()))); __equalsCalc = null; return _equals; } @@ -265,8 +272,8 @@ public class UPEntry implements java.io.Serializable for (int i = 0; i < java.lang.reflect.Array .getLength(getIdenticalCrossReferences()); i++) { - java.lang.Object obj = java.lang.reflect.Array.get( - getIdenticalCrossReferences(), i); + java.lang.Object obj = java.lang.reflect.Array + .get(getIdenticalCrossReferences(), i); if (obj != null && !obj.getClass().isArray()) { _hashCode += obj.hashCode(); @@ -278,8 +285,8 @@ public class UPEntry implements java.io.Serializable for (int i = 0; i < java.lang.reflect.Array .getLength(getLogicalCrossReferences()); i++) { - java.lang.Object obj = java.lang.reflect.Array.get( - getLogicalCrossReferences(), i); + java.lang.Object obj = java.lang.reflect.Array + .get(getLogicalCrossReferences(), i); if (obj != null && !obj.getClass().isArray()) { _hashCode += obj.hashCode();