Merge develop to Release_2_8_3_Branch

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

diff --git a/src/uk/ac/ebi/www/WSFile.java b/src/uk/ac/ebi/www/WSFile.java
index 3a3b57e..210de76 100755 (executable)
--- a/src/uk/ac/ebi/www/WSFile.java
+++ b/src/uk/ac/ebi/www/WSFile.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-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -52,17 +52,18 @@ public class WSFile implements java.io.Serializable
 
   private java.lang.Object __equalsCalc = null;
 
+  @Override
   public synchronized boolean equals(java.lang.Object obj)
   {
-    if (!(obj instanceof WSFile))
+    if (obj == null)
     {
       return false;
     }
-    WSFile other = (WSFile) obj;
-    if (obj == null)
+    if (!(obj instanceof WSFile))
     {
       return false;
     }
+    WSFile other = (WSFile) obj;
     if (this == obj)
     {
       return true;
@@ -84,6 +85,7 @@ public class WSFile implements java.io.Serializable
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)