X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fext%2Fvamsas%2FServiceHandle.java;h=7d276951b00cde462dd597291862f2ae04a86ef0;hb=d0aee5b0b2cbd0805c3dec027c6f2d2ac0148e66;hp=a9c46b88306893ccf7e3aedc3c6cccea12a3aadb;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git

diff --git a/src/ext/vamsas/ServiceHandle.java b/src/ext/vamsas/ServiceHandle.java
index a9c46b8..7d27695 100755
--- a/src/ext/vamsas/ServiceHandle.java
+++ b/src/ext/vamsas/ServiceHandle.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * 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.
  * 
@@ -128,15 +128,15 @@ public class ServiceHandle implements java.io.Serializable
 
   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;
@@ -148,14 +148,19 @@ public class ServiceHandle implements java.io.Serializable
     __equalsCalc = obj;
     boolean _equals;
     _equals = true
-            && ((this.abstractName == null && other.getAbstractName() == null) || (this.abstractName != null && this.abstractName
-                    .equals(other.getAbstractName())))
-            && ((this.description == null && other.getDescription() == null) || (this.description != null && this.description
-                    .equals(other.getDescription())))
-            && ((this.endpointURL == null && other.getEndpointURL() == null) || (this.endpointURL != null && this.endpointURL
-                    .equals(other.getEndpointURL())))
-            && ((this.name == null && other.getName() == null) || (this.name != null && this.name
-                    .equals(other.getName())));
+            && ((this.abstractName == null
+                    && other.getAbstractName() == null)
+                    || (this.abstractName != null && this.abstractName
+                            .equals(other.getAbstractName())))
+            && ((this.description == null && other.getDescription() == null)
+                    || (this.description != null && this.description
+                            .equals(other.getDescription())))
+            && ((this.endpointURL == null && other.getEndpointURL() == null)
+                    || (this.endpointURL != null && this.endpointURL
+                            .equals(other.getEndpointURL())))
+            && ((this.name == null && other.getName() == null)
+                    || (this.name != null
+                            && this.name.equals(other.getName())));
     __equalsCalc = null;
     return _equals;
   }