X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fuk%2Fac%2Febi%2Fwww%2FInputParams.java;h=ba8f8b0d08718b1fa498a72598daf29363d78372;hb=2d28597b643c287eee1f495e56c3529be05bbc5d;hp=ece8614c844c2dfd75bdbeee03e497dad4c8f0c5;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git diff --git a/src/uk/ac/ebi/www/InputParams.java b/src/uk/ac/ebi/www/InputParams.java index ece8614..ba8f8b0 100755 --- a/src/uk/ac/ebi/www/InputParams.java +++ b/src/uk/ac/ebi/www/InputParams.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 . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ package uk.ac.ebi.www; @@ -218,17 +220,18 @@ public class InputParams implements java.io.Serializable private java.lang.Object __equalsCalc = null; + @Override public synchronized boolean equals(java.lang.Object obj) { - if (!(obj instanceof InputParams)) + if (obj == null) { return false; } - InputParams other = (InputParams) obj; - if (obj == null) + if (!(obj instanceof InputParams)) { return false; } + InputParams other = (InputParams) obj; if (this == obj) { return true; @@ -272,6 +275,7 @@ public class InputParams implements java.io.Serializable private boolean __hashCodeCalc = false; + @Override public synchronized int hashCode() { if (__hashCodeCalc) @@ -292,8 +296,8 @@ public class InputParams implements java.io.Serializable { _hashCode += getMatrix().hashCode(); } - _hashCode += new Float(getExp()).hashCode(); - _hashCode += new Boolean(isEchofilter()).hashCode(); + _hashCode += Float.valueOf(getExp()).hashCode(); + _hashCode += Boolean.valueOf(isEchofilter()).hashCode(); if (getFilter() != null) { _hashCode += getFilter().hashCode(); @@ -321,7 +325,7 @@ public class InputParams implements java.io.Serializable _hashCode += getOutformat().hashCode(); } _hashCode += getTopcombon(); - _hashCode += new Boolean(isAsync()).hashCode(); + _hashCode += Boolean.valueOf(isAsync()).hashCode(); if (getEmail() != null) { _hashCode += getEmail().hashCode();