X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FMsaResult.java;h=e4af81ec50629f9d135d89bebd3a01b833ffc0ba;hb=99c58ee0ae2a848f982552e53feaf6d5cb9925e5;hp=97000e4976b910e1efdb43d124d9b5ea4b35c4a5;hpb=5711da5558bce5aa7c96837fd6cb9b49a914c231;p=jalview.git diff --git a/src/vamsas/objects/simple/MsaResult.java b/src/vamsas/objects/simple/MsaResult.java index 97000e4..e4af81e 100755 --- a/src/vamsas/objects/simple/MsaResult.java +++ b/src/vamsas/objects/simple/MsaResult.java @@ -5,6 +5,25 @@ * by the Apache Axis 1.2RC2 Nov 16, 2004 (12:19:44 EST) WSDL2Java emitter. */ +/* +* Jalview - A Sequence Alignment Editor and Viewer +* Copyright (C) 2005 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 +*/ + package vamsas.objects.simple; public class MsaResult extends vamsas.objects.simple.Result implements java.io.Serializable { @@ -21,7 +40,7 @@ public class MsaResult extends vamsas.objects.simple.Result implements java.io /** * Gets the msa value for this MsaResult. - * + * * @return msa */ public vamsas.objects.simple.Alignment getMsa() { @@ -31,7 +50,7 @@ public class MsaResult extends vamsas.objects.simple.Result implements java.io /** * Sets the msa value for this MsaResult. - * + * * @param msa */ public void setMsa(vamsas.objects.simple.Alignment msa) { @@ -49,8 +68,8 @@ public class MsaResult extends vamsas.objects.simple.Result implements java.io } __equalsCalc = obj; boolean _equals; - _equals = super.equals(obj) && - ((this.msa==null && other.getMsa()==null) || + _equals = super.equals(obj) && + ((this.msa==null && other.getMsa()==null) || (this.msa!=null && this.msa.equals(other.getMsa()))); __equalsCalc = null;