X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fext%2Fvamsas%2FServiceHandle.java;h=7d276951b00cde462dd597291862f2ae04a86ef0;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=8b15688e696b25b1ae302087620df66e852a8069;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git

diff --git a/src/ext/vamsas/ServiceHandle.java b/src/ext/vamsas/ServiceHandle.java
index 8b15688..7d27695 100755
--- a/src/ext/vamsas/ServiceHandle.java
+++ b/src/ext/vamsas/ServiceHandle.java
@@ -1,20 +1,22 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
- * This program 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 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * This program 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.
+ * 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.
+ *  
+ * 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package ext.vamsas;
 
@@ -126,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;
@@ -146,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;
   }