X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fext%2Fvamsas%2FServiceHandle.java;h=7d276951b00cde462dd597291862f2ae04a86ef0;hb=b8b5965ecce656c11042aabcda9dca342f320e65;hp=b649c99877f4000dc4b0f8e28b561ab6d5b2b786;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git
diff --git a/src/ext/vamsas/ServiceHandle.java b/src/ext/vamsas/ServiceHandle.java
index b649c99..7d27695 100755
--- 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 .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package ext.vamsas;
@@ -125,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;
@@ -145,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;
}