X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fvamsas%2Fobjects%2Fsimple%2FSeqSearchResult.java;h=04b6f70226f97e705564735c2d567cac818faa88;hb=a04a7992b1055fa52f5031ef9d10d2228ee78899;hp=3b23aba7f36ad143a7950d22e67f4fc35eef3651;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/vamsas/objects/simple/SeqSearchResult.java b/src/vamsas/objects/simple/SeqSearchResult.java
index 3b23aba..04b6f70 100644
--- a/src/vamsas/objects/simple/SeqSearchResult.java
+++ b/src/vamsas/objects/simple/SeqSearchResult.java
@@ -1,25 +1,27 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * 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 vamsas.objects.simple;
-public class SeqSearchResult extends vamsas.objects.simple.Result implements
- java.io.Serializable
+public class SeqSearchResult extends vamsas.objects.simple.Result
+ implements java.io.Serializable
{
private vamsas.objects.simple.Alignment alignment;
@@ -125,15 +127,22 @@ public class SeqSearchResult extends vamsas.objects.simple.Result implements
private java.lang.Object __equalsCalc = null;
+ @Override
public synchronized boolean equals(java.lang.Object obj)
{
+ if (obj == null)
+ {
+ return false;
+ }
if (!(obj instanceof SeqSearchResult))
+ {
return false;
+ }
SeqSearchResult other = (SeqSearchResult) obj;
- if (obj == null)
- return false;
if (this == obj)
+ {
return true;
+ }
if (__equalsCalc != null)
{
return (__equalsCalc == obj);
@@ -141,20 +150,25 @@ public class SeqSearchResult extends vamsas.objects.simple.Result implements
__equalsCalc = obj;
boolean _equals;
_equals = super.equals(obj)
- && ((this.alignment == null && other.getAlignment() == null) || (this.alignment != null && this.alignment
- .equals(other.getAlignment())))
- && ((this.annotation == null && other.getAnnotation() == null) || (this.annotation != null && this.annotation
- .equals(other.getAnnotation())))
- && ((this.features == null && other.getFeatures() == null) || (this.features != null && this.features
- .equals(other.getFeatures())))
- && ((this.newickTree == null && other.getNewickTree() == null) || (this.newickTree != null && this.newickTree
- .equals(other.getNewickTree())));
+ && ((this.alignment == null && other.getAlignment() == null)
+ || (this.alignment != null
+ && this.alignment.equals(other.getAlignment())))
+ && ((this.annotation == null && other.getAnnotation() == null)
+ || (this.annotation != null && this.annotation
+ .equals(other.getAnnotation())))
+ && ((this.features == null && other.getFeatures() == null)
+ || (this.features != null
+ && this.features.equals(other.getFeatures())))
+ && ((this.newickTree == null && other.getNewickTree() == null)
+ || (this.newickTree != null && this.newickTree
+ .equals(other.getNewickTree())));
__equalsCalc = null;
return _equals;
}
private boolean __hashCodeCalc = false;
+ @Override
public synchronized int hashCode()
{
if (__hashCodeCalc)