X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbinding%2FSequence.java;h=628e209edb34ee8364180640cb6a037379447479;hb=588042b69abf8e60bcc950b24c283933c7dd422f;hp=290354ef7363e976c480b80dcda6729e9c75cbb1;hpb=5cd8e373c75fb348ecda4d94d8a46468fb92756d;p=jalview.git diff --git a/src/jalview/binding/Sequence.java b/src/jalview/binding/Sequence.java index 290354e..628e209 100755 --- a/src/jalview/binding/Sequence.java +++ b/src/jalview/binding/Sequence.java @@ -4,7 +4,6 @@ * Schema. * $Id$ */ - /* * Jalview - A Sequence Alignment Editor and Viewer * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle @@ -23,63 +22,49 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ - package jalview.binding; - //---------------------------------/ - //- Imported classes and packages -/ -//---------------------------------/ - -import java.io.IOException; -import java.io.Reader; -import java.io.Serializable; -import java.io.Writer; import org.exolab.castor.xml.MarshalException; import org.exolab.castor.xml.Marshaller; import org.exolab.castor.xml.Unmarshaller; import org.exolab.castor.xml.ValidationException; + import org.xml.sax.ContentHandler; +//---------------------------------/ +//- Imported classes and packages -/ +//---------------------------------/ +import java.io.IOException; +import java.io.Reader; +import java.io.Serializable; +import java.io.Writer; + + /** * Class Sequence. * * @version $Revision$ $Date$ */ -public class Sequence extends SequenceType -implements java.io.Serializable -{ - - - //----------------/ - //- Constructors -/ +public class Sequence extends SequenceType implements java.io.Serializable { + //----------------/ + //- Constructors -/ //----------------/ - public Sequence() { super(); - } //-- jalview.binding.Sequence() + } + //-- jalview.binding.Sequence() + //-----------/ - - //-----------/ - //- Methods -/ - //-----------/ - - /** - * Method isValid - * - * - * - * @return boolean - */ - public boolean isValid() - { + public boolean isValid() { try { validate(); - } - catch (org.exolab.castor.xml.ValidationException vex) { + } catch (org.exolab.castor.xml.ValidationException vex) { return false; } + return true; - } //-- boolean isValid() + } + //-- boolean isValid() /** * Method marshal @@ -89,11 +74,11 @@ implements java.io.Serializable * @param out */ public void marshal(java.io.Writer out) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException - { - + throws org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, out); - } //-- void marshal(java.io.Writer) + } + //-- void marshal(java.io.Writer) /** * Method marshal @@ -103,11 +88,11 @@ implements java.io.Serializable * @param handler */ public void marshal(org.xml.sax.ContentHandler handler) - throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException - { - + throws java.io.IOException, org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); - } //-- void marshal(org.xml.sax.ContentHandler) + } + //-- void marshal(org.xml.sax.ContentHandler) /** * Method unmarshal @@ -118,20 +103,20 @@ implements java.io.Serializable * @return Object */ public static java.lang.Object unmarshal(java.io.Reader reader) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException - { - return (jalview.binding.Sequence) Unmarshaller.unmarshal(jalview.binding.Sequence.class, reader); - } //-- java.lang.Object unmarshal(java.io.Reader) + throws org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { + return (jalview.binding.Sequence) Unmarshaller.unmarshal(jalview.binding.Sequence.class, + reader); + } + //-- java.lang.Object unmarshal(java.io.Reader) /** * Method validate * */ - public void validate() - throws org.exolab.castor.xml.ValidationException - { + public void validate() throws org.exolab.castor.xml.ValidationException { org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator(); validator.validate(this); - } //-- void validate() - + } + //-- void validate() }