JAL-2089 patch broken merge to master for Release 2.10.0b1

[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 b12de70..2020fc9 100755 (executable)
--- a/src/uk/ac/ebi/www/Data.java
+++ b/src/uk/ac/ebi/www/Data.java
@@ -52,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;
@@ -84,6 +85,7 @@ public class Data implements java.io.Serializable
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)