X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fext%2Fvamsas%2FServiceHandles.java;h=a0e0456a6c28fcba9af9e1381ab0b510625ac4be;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=ab69a8b677fcbc560108390280144718af5309ab;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git diff --git a/src/ext/vamsas/ServiceHandles.java b/src/ext/vamsas/ServiceHandles.java index ab69a8b..a0e0456 100755 --- a/src/ext/vamsas/ServiceHandles.java +++ b/src/ext/vamsas/ServiceHandles.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. * @@ -57,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; @@ -76,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; } @@ -94,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();