X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FSequence.java;h=d2eccb01bd0d67a6cdf4463f0a48d23a8159e592;hb=783520af519c958e10a2af29f1d4242e1ab890a3;hp=c8dd81e0390c58cdd983ad7fa12e1683e65d8306;hpb=99c58ee0ae2a848f982552e53feaf6d5cb9925e5;p=jalview.git diff --git a/src/vamsas/objects/simple/Sequence.java b/src/vamsas/objects/simple/Sequence.java index c8dd81e..d2eccb0 100755 --- a/src/vamsas/objects/simple/Sequence.java +++ b/src/vamsas/objects/simple/Sequence.java @@ -5,25 +5,6 @@ * 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 Sequence implements java.io.Serializable { @@ -43,7 +24,7 @@ public class Sequence implements java.io.Serializable { /** * Gets the id value for this Sequence. - * + * * @return id */ public java.lang.String getId() { @@ -53,7 +34,7 @@ public class Sequence implements java.io.Serializable { /** * Sets the id value for this Sequence. - * + * * @param id */ public void setId(java.lang.String id) { @@ -63,7 +44,7 @@ public class Sequence implements java.io.Serializable { /** * Gets the seq value for this Sequence. - * + * * @return seq */ public java.lang.String getSeq() { @@ -73,7 +54,7 @@ public class Sequence implements java.io.Serializable { /** * Sets the seq value for this Sequence. - * + * * @param seq */ public void setSeq(java.lang.String seq) { @@ -91,11 +72,11 @@ public class Sequence implements java.io.Serializable { } __equalsCalc = obj; boolean _equals; - _equals = true && - ((this.id==null && other.getId()==null) || + _equals = true && + ((this.id==null && other.getId()==null) || (this.id!=null && this.id.equals(other.getId()))) && - ((this.seq==null && other.getSeq()==null) || + ((this.seq==null && other.getSeq()==null) || (this.seq!=null && this.seq.equals(other.getSeq()))); __equalsCalc = null;