X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fuk%2Fac%2Febi%2Fwww%2FInputParams.java;fp=src%2Fuk%2Fac%2Febi%2Fwww%2FInputParams.java;h=514d886d135e74835bcb759b7bd626d4b3f30fc5;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=ba8f8b0d08718b1fa498a72598daf29363d78372;hpb=49db0dff1da16c3355b43a41498c1fc93ef47e91;p=jalview.git diff --git a/src/uk/ac/ebi/www/InputParams.java b/src/uk/ac/ebi/www/InputParams.java index ba8f8b0..514d886 100755 --- a/src/uk/ac/ebi/www/InputParams.java +++ b/src/uk/ac/ebi/www/InputParams.java @@ -242,33 +242,32 @@ public class InputParams implements java.io.Serializable } __equalsCalc = obj; boolean _equals; - _equals = true - && ((program == null && other.getProgram() == null) || (program != null && program - .equals(other.getProgram()))) - && ((database == null && other.getDatabase() == null) || (database != null && database - .equals(other.getDatabase()))) - && ((matrix == null && other.getMatrix() == null) || (matrix != null && matrix - .equals(other.getMatrix()))) - && exp == other.getExp() - && echofilter == other.isEchofilter() - && ((filter == null && other.getFilter() == null) || (filter != null && filter - .equals(other.getFilter()))) - && numal == other.getNumal() - && scores == other.getScores() - && ((sensitivity == null && other.getSensitivity() == null) || (sensitivity != null && sensitivity - .equals(other.getSensitivity()))) - && ((sort == null && other.getSort() == null) || (sort != null && sort - .equals(other.getSort()))) - && ((stats == null && other.getStats() == null) || (stats != null && stats - .equals(other.getStats()))) - && ((strand == null && other.getStrand() == null) || (strand != null && strand - .equals(other.getStrand()))) - && ((outformat == null && other.getOutformat() == null) || (outformat != null && outformat - .equals(other.getOutformat()))) - && topcombon == other.getTopcombon() - && async == other.isAsync() - && ((email == null && other.getEmail() == null) || (email != null && email - .equals(other.getEmail()))); + _equals = true && ((program == null && other.getProgram() == null) + || (program != null && program.equals(other.getProgram()))) + && ((database == null && other.getDatabase() == null) + || (database != null + && database.equals(other.getDatabase()))) + && ((matrix == null && other.getMatrix() == null) + || (matrix != null && matrix.equals(other.getMatrix()))) + && exp == other.getExp() && echofilter == other.isEchofilter() + && ((filter == null && other.getFilter() == null) + || (filter != null && filter.equals(other.getFilter()))) + && numal == other.getNumal() && scores == other.getScores() + && ((sensitivity == null && other.getSensitivity() == null) + || (sensitivity != null + && sensitivity.equals(other.getSensitivity()))) + && ((sort == null && other.getSort() == null) + || (sort != null && sort.equals(other.getSort()))) + && ((stats == null && other.getStats() == null) + || (stats != null && stats.equals(other.getStats()))) + && ((strand == null && other.getStrand() == null) + || (strand != null && strand.equals(other.getStrand()))) + && ((outformat == null && other.getOutformat() == null) + || (outformat != null + && outformat.equals(other.getOutformat()))) + && topcombon == other.getTopcombon() && async == other.isAsync() + && ((email == null && other.getEmail() == null) + || (email != null && email.equals(other.getEmail()))); __equalsCalc = null; return _equals; }