X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FMsaResult.java;h=31ab02f4f1ae4e5b3cc43e52903a003ad1600a91;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=173a2e7e536e915b83b57b19f6ae606e2db011d4;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git
diff --git a/src/vamsas/objects/simple/MsaResult.java b/src/vamsas/objects/simple/MsaResult.java
index 173a2e7..31ab02f 100755
--- a/src/vamsas/objects/simple/MsaResult.java
+++ b/src/vamsas/objects/simple/MsaResult.java
@@ -1,42 +1,27 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, 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 .
- */
-/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * 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 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.
- *
* 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package vamsas.objects.simple;
-public class MsaResult extends vamsas.objects.simple.Result implements
- java.io.Serializable
+public class MsaResult extends vamsas.objects.simple.Result
+ implements java.io.Serializable
{
private vamsas.objects.simple.Alignment msa;
@@ -73,20 +58,20 @@ public class MsaResult extends vamsas.objects.simple.Result implements
this.msa = msa;
}
+ @Override
public synchronized boolean equals(java.lang.Object obj)
{
- if (!(obj instanceof MsaResult))
+ if (obj == null)
{
return false;
}
-
- MsaResult other = (MsaResult) obj;
-
- if (obj == null)
+ if (!(obj instanceof MsaResult))
{
return false;
}
+ MsaResult other = (MsaResult) obj;
+
if (this == obj)
{
return true;
@@ -100,14 +85,15 @@ public class MsaResult extends vamsas.objects.simple.Result implements
__equalsCalc = obj;
boolean _equals;
- _equals = super.equals(obj)
- && (((this.msa == null) && (other.getMsa() == null)) || ((this.msa != null) && this.msa
- .equals(other.getMsa())));
+ _equals = super.equals(obj) && (((this.msa == null)
+ && (other.getMsa() == null))
+ || ((this.msa != null) && this.msa.equals(other.getMsa())));
__equalsCalc = null;
return _equals;
}
+ @Override
public synchronized int hashCode()
{
if (__hashCodeCalc)