X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fext%2Fvamsas%2FServiceHandles.java;h=a0e0456a6c28fcba9af9e1381ab0b510625ac4be;hb=2a1686e13e5641fb7f353931e2160e76b1f548e4;hp=250f8bc7bf9ce77ac277b58c3d13a57ca61cc6a3;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git
diff --git a/src/ext/vamsas/ServiceHandles.java b/src/ext/vamsas/ServiceHandles.java
index 250f8bc..a0e0456 100755
--- a/src/ext/vamsas/ServiceHandles.java
+++ b/src/ext/vamsas/ServiceHandles.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
- * 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.
*
* 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;
@@ -55,15 +57,15 @@ public class ServiceHandles implements java.io.Serializable
public synchronized boolean equals(java.lang.Object obj)
{
- if (!(obj instanceof ServiceHandles))
+ if (obj == null)
{
return false;
}
- ServiceHandles other = (ServiceHandles) obj;
- if (obj == null)
+ if (!(obj instanceof ServiceHandles))
{
return false;
}
+ ServiceHandles other = (ServiceHandles) obj;
if (this == obj)
{
return true;
@@ -74,8 +76,10 @@ public class ServiceHandles implements java.io.Serializable
}
__equalsCalc = obj;
boolean _equals;
- _equals = true && ((this.services == null && other.getServices() == null) || (this.services != null && java.util.Arrays
- .equals(this.services, other.getServices())));
+ _equals = true
+ && ((this.services == null && other.getServices() == null)
+ || (this.services != null && java.util.Arrays
+ .equals(this.services, other.getServices())));
__equalsCalc = null;
return _equals;
}
@@ -92,10 +96,11 @@ public class ServiceHandles implements java.io.Serializable
int _hashCode = 1;
if (getServices() != null)
{
- for (int i = 0; i < java.lang.reflect.Array.getLength(getServices()); i++)
+ for (int i = 0; i < java.lang.reflect.Array
+ .getLength(getServices()); i++)
{
- java.lang.Object obj = java.lang.reflect.Array
- .get(getServices(), i);
+ java.lang.Object obj = java.lang.reflect.Array.get(getServices(),
+ i);
if (obj != null && !obj.getClass().isArray())
{
_hashCode += obj.hashCode();