X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fbinding%2FJalviewModel.java;h=bfdbddca49240f3c439d97928288424c3f75edb8;hb=b8d09897dacc7b0ad203982b4578e2c1d8929142;hp=d30e97ddfc4026690fb7ad8d31b7b5488b358248;hpb=99c58ee0ae2a848f982552e53feaf6d5cb9925e5;p=jalview.git diff --git a/src/jalview/binding/JalviewModel.java b/src/jalview/binding/JalviewModel.java index d30e97d..bfdbddc 100755 --- a/src/jalview/binding/JalviewModel.java +++ b/src/jalview/binding/JalviewModel.java @@ -4,53 +4,35 @@ * Schema. * $Id$ */ +package jalview.binding; -/* -* 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 -*/ +import org.exolab.castor.xml.MarshalException; +import org.exolab.castor.xml.Marshaller; +import org.exolab.castor.xml.Unmarshaller; +import org.exolab.castor.xml.ValidationException; -package jalview.binding; +import org.xml.sax.ContentHandler; - //---------------------------------/ - //- Imported classes and packages -/ //---------------------------------/ - +//- Imported classes and packages -/ +//---------------------------------/ import java.io.IOException; import java.io.Reader; import java.io.Serializable; import java.io.Writer; + import java.util.Date; -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; + /** * Class JalviewModel. * * @version $Revision$ $Date$ */ -public class JalviewModel implements java.io.Serializable { - - - //--------------------------/ - //- Class/Member Variables -/ +public class JalviewModel implements java.io.Serializable +{ + //--------------------------/ + //- Class/Member Variables -/ //--------------------------/ /** @@ -59,6 +41,11 @@ public class JalviewModel implements java.io.Serializable { private java.util.Date _creationDate; /** + * Field _version + */ + private java.lang.String _version; + + /** * Field _vamsasModel */ private jalview.binding.VamsasModel _vamsasModel; @@ -68,30 +55,28 @@ public class JalviewModel implements java.io.Serializable { */ private jalview.binding.JalviewModelSequence _jalviewModelSequence; - - //----------------/ - //- Constructors -/ //----------------/ - - public JalviewModel() { + //- Constructors -/ + //----------------/ + public JalviewModel() + { super(); - } //-- jalview.binding.JalviewModel() + } - - //-----------/ - //- Methods -/ + //-- jalview.binding.JalviewModel() //-----------/ /** - * Returns the value of field 'creationDate'. + * DOCUMENT ME! * - * @return Date - * @return the value of field 'creationDate'. + * @return DOCUMENT ME! */ public java.util.Date getCreationDate() { return this._creationDate; - } //-- java.util.Date getCreationDate() + } + + //-- java.util.Date getCreationDate() /** * Returns the value of field 'jalviewModelSequence'. @@ -102,7 +87,9 @@ public class JalviewModel implements java.io.Serializable { public jalview.binding.JalviewModelSequence getJalviewModelSequence() { return this._jalviewModelSequence; - } //-- jalview.binding.JalviewModelSequence getJalviewModelSequence() + } + + //-- jalview.binding.JalviewModelSequence getJalviewModelSequence() /** * Returns the value of field 'vamsasModel'. @@ -113,7 +100,22 @@ public class JalviewModel implements java.io.Serializable { public jalview.binding.VamsasModel getVamsasModel() { return this._vamsasModel; - } //-- jalview.binding.VamsasModel getVamsasModel() + } + + //-- jalview.binding.VamsasModel getVamsasModel() + + /** + * Returns the value of field 'version'. + * + * @return String + * @return the value of field 'version'. + */ + public java.lang.String getVersion() + { + return this._version; + } + + //-- java.lang.String getVersion() /** * Method isValid @@ -124,14 +126,19 @@ public class JalviewModel implements java.io.Serializable { */ public boolean isValid() { - try { + 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 @@ -141,11 +148,13 @@ public class JalviewModel 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 @@ -155,11 +164,13 @@ public class JalviewModel 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) /** * Sets the value of field 'creationDate'. @@ -169,7 +180,9 @@ public class JalviewModel implements java.io.Serializable { public void setCreationDate(java.util.Date creationDate) { this._creationDate = creationDate; - } //-- void setCreationDate(java.util.Date) + } + + //-- void setCreationDate(java.util.Date) /** * Sets the value of field 'jalviewModelSequence'. @@ -177,10 +190,13 @@ public class JalviewModel implements java.io.Serializable { * @param jalviewModelSequence the value of field * 'jalviewModelSequence'. */ - public void setJalviewModelSequence(jalview.binding.JalviewModelSequence jalviewModelSequence) + public void setJalviewModelSequence( + jalview.binding.JalviewModelSequence jalviewModelSequence) { this._jalviewModelSequence = jalviewModelSequence; - } //-- void setJalviewModelSequence(jalview.binding.JalviewModelSequence) + } + + //-- void setJalviewModelSequence(jalview.binding.JalviewModelSequence) /** * Sets the value of field 'vamsasModel'. @@ -190,7 +206,21 @@ public class JalviewModel implements java.io.Serializable { public void setVamsasModel(jalview.binding.VamsasModel vamsasModel) { this._vamsasModel = vamsasModel; - } //-- void setVamsasModel(jalview.binding.VamsasModel) + } + + //-- void setVamsasModel(jalview.binding.VamsasModel) + + /** + * Sets the value of field 'version'. + * + * @param version the value of field 'version'. + */ + public void setVersion(java.lang.String version) + { + this._version = version; + } + + //-- void setVersion(java.lang.String) /** * Method unmarshal @@ -201,20 +231,24 @@ public class JalviewModel 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 + throws org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { - return (jalview.binding.JalviewModel) Unmarshaller.unmarshal(jalview.binding.JalviewModel.class, reader); - } //-- java.lang.Object unmarshal(java.io.Reader) + return (jalview.binding.JalviewModel) Unmarshaller.unmarshal(jalview.binding.JalviewModel.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() }