X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FAlignment.java;fp=src%2Fvamsas%2Fobjects%2Fsimple%2FAlignment.java;h=82df8bd506da3b1c0d910c0490acd98b3e45c3ba;hb=9c98d4bd666346f6ad3892c5394b7da3be82d93e;hp=9d47b6ae179720a5f9a8128b62f807bf29230c09;hpb=c7b2143c9cf7c5e05ad63251f7d3910751b16d20;p=jalview.git diff --git a/src/vamsas/objects/simple/Alignment.java b/src/vamsas/objects/simple/Alignment.java index 9d47b6a..82df8bd 100755 --- a/src/vamsas/objects/simple/Alignment.java +++ b/src/vamsas/objects/simple/Alignment.java @@ -20,8 +20,8 @@ */ package vamsas.objects.simple; -public class Alignment extends vamsas.objects.simple.Object implements - java.io.Serializable +public class Alignment extends vamsas.objects.simple.Object + implements java.io.Serializable { private java.lang.String gapchar; @@ -126,12 +126,15 @@ public class Alignment extends vamsas.objects.simple.Object implements __equalsCalc = obj; boolean _equals; _equals = super.equals(obj) - && ((this.gapchar == null && other.getGapchar() == null) || (this.gapchar != null && this.gapchar - .equals(other.getGapchar()))) - && ((this.method == null && other.getMethod() == null) || (this.method != null && java.util.Arrays - .equals(this.method, other.getMethod()))) - && ((this.seqs == null && other.getSeqs() == null) || (this.seqs != null && this.seqs - .equals(other.getSeqs()))); + && ((this.gapchar == null && other.getGapchar() == null) + || (this.gapchar != null + && this.gapchar.equals(other.getGapchar()))) + && ((this.method == null && other.getMethod() == null) + || (this.method != null && java.util.Arrays + .equals(this.method, other.getMethod()))) + && ((this.seqs == null && other.getSeqs() == null) + || (this.seqs != null + && this.seqs.equals(other.getSeqs()))); __equalsCalc = null; return _equals; } @@ -153,7 +156,8 @@ public class Alignment extends vamsas.objects.simple.Object implements } if (getMethod() != null) { - for (int i = 0; i < java.lang.reflect.Array.getLength(getMethod()); i++) + for (int i = 0; i < java.lang.reflect.Array + .getLength(getMethod()); i++) { java.lang.Object obj = java.lang.reflect.Array.get(getMethod(), i); if (obj != null && !obj.getClass().isArray())