JAL-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...

[jalview.git] / src / ext / vamsas / ServiceHandle.java

diff --git a/src/ext/vamsas/ServiceHandle.java b/src/ext/vamsas/ServiceHandle.java
index b649c99..428b5ea 100755 (executable)
--- a/src/ext/vamsas/ServiceHandle.java
+++ b/src/ext/vamsas/ServiceHandle.java
@@ -1,19 +1,22 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, 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 ext.vamsas;
 
@@ -123,17 +126,18 @@ public class ServiceHandle implements java.io.Serializable
 
   private java.lang.Object __equalsCalc = null;
 
+  @Override
   public synchronized boolean equals(java.lang.Object obj)
   {
-    if (!(obj instanceof ServiceHandle))
+    if (obj == null)
     {
       return false;
     }
-    ServiceHandle other = (ServiceHandle) obj;
-    if (obj == null)
+    if (!(obj instanceof ServiceHandle))
     {
       return false;
     }
+    ServiceHandle other = (ServiceHandle) obj;
     if (this == obj)
     {
       return true;
@@ -159,6 +163,7 @@ public class ServiceHandle implements java.io.Serializable
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)
@@ -188,7 +193,7 @@ public class ServiceHandle implements java.io.Serializable
   }
 
   // Type metadata
-  private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc(
+  private static final org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc(
           ServiceHandle.class, true);
 
   static