JAL-3438 spotless for 2.11.2.0

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

diff --git a/src/uk/ac/ebi/www/Data.java b/src/uk/ac/ebi/www/Data.java
index 4ddcfb9..5d83043 100755 (executable)
--- a/src/uk/ac/ebi/www/Data.java
+++ b/src/uk/ac/ebi/www/Data.java
@@ -1,19 +1,22 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * 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;
 
@@ -49,17 +52,18 @@ public class Data implements java.io.Serializable
 
   private java.lang.Object __equalsCalc = null;
 
+  @Override
   public synchronized boolean equals(java.lang.Object obj)
   {
-    if (!(obj instanceof Data))
+    if (obj == null)
     {
       return false;
     }
-    Data other = (Data) obj;
-    if (obj == null)
+    if (!(obj instanceof Data))
     {
       return false;
     }
+    Data other = (Data) obj;
     if (this == obj)
     {
       return true;
@@ -71,16 +75,18 @@ public class Data implements java.io.Serializable
     __equalsCalc = obj;
     boolean _equals;
     _equals = true
-            && ((type == null && other.getType() == null) || (type != null && type
-                    .equals(other.getType())))
-            && ((content == null && other.getContent() == null) || (content != null && content
-                    .equals(other.getContent())));
+            && ((type == null && other.getType() == null)
+                    || (type != null && type.equals(other.getType())))
+            && ((content == null && other.getContent() == null)
+                    || (content != null
+                            && content.equals(other.getContent())));
     __equalsCalc = null;
     return _equals;
   }
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)