X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbinding%2FJalviewModel.java;h=bfdbddca49240f3c439d97928288424c3f75edb8;hb=b8d09897dacc7b0ad203982b4578e2c1d8929142;hp=85bfe26ac63eeaf431bbb5457ba3b602305b04f8;hpb=588042b69abf8e60bcc950b24c283933c7dd422f;p=jalview.git diff --git a/src/jalview/binding/JalviewModel.java b/src/jalview/binding/JalviewModel.java index 85bfe26..bfdbddc 100755 --- a/src/jalview/binding/JalviewModel.java +++ b/src/jalview/binding/JalviewModel.java @@ -4,24 +4,6 @@ * Schema. * $Id$ */ -/* -* 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 jalview.binding; import org.exolab.castor.xml.MarshalException; @@ -47,7 +29,8 @@ import java.util.Date; * * @version $Revision$ $Date$ */ -public class JalviewModel implements java.io.Serializable { +public class JalviewModel implements java.io.Serializable +{ //--------------------------/ //- Class/Member Variables -/ //--------------------------/ @@ -58,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; @@ -70,16 +58,25 @@ public class JalviewModel implements java.io.Serializable { //----------------/ //- Constructors -/ //----------------/ - public JalviewModel() { + public JalviewModel() + { super(); } - //-- jalview.binding.JalviewModel() - //-----------/ - public java.util.Date getCreationDate() { + //-- jalview.binding.JalviewModel() + //-----------/ + + /** + * DOCUMENT ME! + * + * @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'. @@ -87,10 +84,12 @@ public class JalviewModel implements java.io.Serializable { * @return JalviewModelSequence * @return the value of field 'jalviewModelSequence'. */ - public jalview.binding.JalviewModelSequence getJalviewModelSequence() { + public jalview.binding.JalviewModelSequence getJalviewModelSequence() + { return this._jalviewModelSequence; } - //-- jalview.binding.JalviewModelSequence getJalviewModelSequence() + + //-- jalview.binding.JalviewModelSequence getJalviewModelSequence() /** * Returns the value of field 'vamsasModel'. @@ -98,10 +97,25 @@ public class JalviewModel implements java.io.Serializable { * @return VamsasModel * @return the value of field 'vamsasModel'. */ - public jalview.binding.VamsasModel getVamsasModel() { + 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 @@ -110,16 +124,21 @@ public class JalviewModel implements java.io.Serializable { * * @return boolean */ - public boolean isValid() { - try { + 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 @@ -130,10 +149,12 @@ public class JalviewModel implements java.io.Serializable { */ public void marshal(java.io.Writer out) throws org.exolab.castor.xml.MarshalException, - org.exolab.castor.xml.ValidationException { + org.exolab.castor.xml.ValidationException + { Marshaller.marshal(this, out); } - //-- void marshal(java.io.Writer) + + //-- void marshal(java.io.Writer) /** * Method marshal @@ -144,20 +165,24 @@ public class JalviewModel implements java.io.Serializable { */ public void marshal(org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, - org.exolab.castor.xml.ValidationException { + 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'. * * @param creationDate the value of field 'creationDate'. */ - public void setCreationDate(java.util.Date creationDate) { + 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'. @@ -166,20 +191,36 @@ public class JalviewModel implements java.io.Serializable { * 'jalviewModelSequence'. */ public void setJalviewModelSequence( - jalview.binding.JalviewModelSequence jalviewModelSequence) { + jalview.binding.JalviewModelSequence jalviewModelSequence) + { this._jalviewModelSequence = jalviewModelSequence; } - //-- void setJalviewModelSequence(jalview.binding.JalviewModelSequence) + + //-- void setJalviewModelSequence(jalview.binding.JalviewModelSequence) /** * Sets the value of field 'vamsasModel'. * * @param vamsasModel the value of field 'vamsasModel'. */ - public void setVamsasModel(jalview.binding.VamsasModel vamsasModel) { + 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 @@ -191,19 +232,23 @@ public class JalviewModel implements java.io.Serializable { */ public static java.lang.Object unmarshal(java.io.Reader reader) throws org.exolab.castor.xml.MarshalException, - org.exolab.castor.xml.ValidationException { + org.exolab.castor.xml.ValidationException + { return (jalview.binding.JalviewModel) Unmarshaller.unmarshal(jalview.binding.JalviewModel.class, reader); } - //-- java.lang.Object unmarshal(java.io.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() }