X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbinding%2FJalviewModel.java;h=cebd8138d3bc0b2fcf99195ea3d3efd7210a68e0;hb=ad15cff29620f960119f80176f1fd443da9f6763;hp=eae870d124b9a81a8953987942a5d907a1816e52;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git diff --git a/src/jalview/binding/JalviewModel.java b/src/jalview/binding/JalviewModel.java old mode 100755 new mode 100644 index eae870d..cebd813 --- a/src/jalview/binding/JalviewModel.java +++ b/src/jalview/binding/JalviewModel.java @@ -1,26 +1,28 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4) - * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * - * 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 file is part of Jalview. * - * 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. + * Jalview 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 3 + * of the License, or (at your option) any later version. + * + * Jalview 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 + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.binding; -// ---------------------------------/ -// - Imported classes and packages -/ -// ---------------------------------/ +//---------------------------------/ +//- Imported classes and packages -/ +//---------------------------------/ import org.exolab.castor.xml.Marshaller; import org.exolab.castor.xml.Unmarshaller; @@ -132,11 +134,10 @@ public class JalviewModel implements java.io.Serializable * * @param out * @throws org.exolab.castor.xml.MarshalException - * if object is null or if any SAXException is thrown during - * marshaling + * if object is null or if any SAXException is thrown during + * marshaling * @throws org.exolab.castor.xml.ValidationException - * if this object is an invalid instance according to the - * schema + * if this object is an invalid instance according to the schema */ public void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, @@ -150,13 +151,12 @@ public class JalviewModel implements java.io.Serializable * * @param handler * @throws java.io.IOException - * if an IOException occurs during marshaling + * if an IOException occurs during marshaling * @throws org.exolab.castor.xml.ValidationException - * if this object is an invalid instance according to the - * schema + * if this object is an invalid instance according to the schema * @throws org.exolab.castor.xml.MarshalException - * if object is null or if any SAXException is thrown during - * marshaling + * if object is null or if any SAXException is thrown during + * marshaling */ public void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, @@ -170,7 +170,7 @@ public class JalviewModel implements java.io.Serializable * Sets the value of field 'creationDate'. * * @param creationDate - * the value of field 'creationDate'. + * the value of field 'creationDate'. */ public void setCreationDate(final java.util.Date creationDate) { @@ -181,7 +181,7 @@ public class JalviewModel implements java.io.Serializable * Sets the value of field 'jalviewModelSequence'. * * @param jalviewModelSequence - * the value of field 'jalviewModelSequence'. + * the value of field 'jalviewModelSequence'. */ public void setJalviewModelSequence( final jalview.binding.JalviewModelSequence jalviewModelSequence) @@ -193,7 +193,7 @@ public class JalviewModel implements java.io.Serializable * Sets the value of field 'vamsasModel'. * * @param vamsasModel - * the value of field 'vamsasModel'. + * the value of field 'vamsasModel'. */ public void setVamsasModel(final jalview.binding.VamsasModel vamsasModel) { @@ -204,7 +204,7 @@ public class JalviewModel implements java.io.Serializable * Sets the value of field 'version'. * * @param version - * the value of field 'version'. + * the value of field 'version'. */ public void setVersion(final java.lang.String version) { @@ -216,11 +216,10 @@ public class JalviewModel implements java.io.Serializable * * @param reader * @throws org.exolab.castor.xml.MarshalException - * if object is null or if any SAXException is thrown during - * marshaling + * if object is null or if any SAXException is thrown during + * marshaling * @throws org.exolab.castor.xml.ValidationException - * if this object is an invalid instance according to the - * schema + * if this object is an invalid instance according to the schema * @return the unmarshaled jalview.binding.JalviewModel */ public static jalview.binding.JalviewModel unmarshal( @@ -236,8 +235,7 @@ public class JalviewModel implements java.io.Serializable * * * @throws org.exolab.castor.xml.ValidationException - * if this object is an invalid instance according to the - * schema + * if this object is an invalid instance according to the schema */ public void validate() throws org.exolab.castor.xml.ValidationException {