JAL-3438 spotless for 2.11.2.0

[jalview.git] / src / uk / ac / ebi / www / InputParams.java

diff --git a/src/uk/ac/ebi/www/InputParams.java b/src/uk/ac/ebi/www/InputParams.java
index bbaf521..514d886 100755 (executable)
--- 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.0b1)
- * 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * 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;
@@ -239,39 +242,39 @@ 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;
   }
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)
@@ -292,8 +295,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 +324,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();