X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fuk%2Fac%2Febi%2Fwww%2FInputParams.java;h=696214a87ad450b90a21f5b249713786cca0ea22;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=c95ba3c91bc7a79d601e61ae113a438818e033e4;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/uk/ac/ebi/www/InputParams.java b/src/uk/ac/ebi/www/InputParams.java index c95ba3c..696214a 100755 --- a/src/uk/ac/ebi/www/InputParams.java +++ b/src/uk/ac/ebi/www/InputParams.java @@ -1,6 +1,6 @@ /* - * 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 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -220,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; @@ -274,6 +275,7 @@ public class InputParams implements java.io.Serializable private boolean __hashCodeCalc = false; + @Override public synchronized int hashCode() { if (__hashCodeCalc)