X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbinding%2FSetting.java;h=743227f2fcfd4a3af8564627e74d8e8c5fd0f4ee;hb=8f1d9040aa9ddac452311d6bb232f7f28f7e83e7;hp=3f05e2760ae68534e0209564eed41b2588e80a9f;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git diff --git a/src/jalview/binding/Setting.java b/src/jalview/binding/Setting.java old mode 100755 new mode 100644 index 3f05e27..743227f --- a/src/jalview/binding/Setting.java +++ b/src/jalview/binding/Setting.java @@ -1,26 +1,25 @@ /* - * 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 2.8) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, 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 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 + * You should have received a copy of the GNU General Public License along with Jalview. If not, see . */ package jalview.binding; -// ---------------------------------/ -// - Imported classes and packages -/ -// ---------------------------------/ +//---------------------------------/ +//- Imported classes and packages -/ +//---------------------------------/ import org.exolab.castor.xml.Marshaller; import org.exolab.castor.xml.Unmarshaller; @@ -76,14 +75,14 @@ public class Setting implements java.io.Serializable // -----------/ /** - */ + */ public void deleteColour() { this._has_colour = false; } /** - */ + */ public void deleteDisplay() { this._has_display = false; @@ -171,11 +170,10 @@ public class Setting 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, @@ -189,13 +187,12 @@ public class Setting 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, @@ -209,7 +206,7 @@ public class Setting implements java.io.Serializable * Sets the value of field 'colour'. * * @param colour - * the value of field 'colour'. + * the value of field 'colour'. */ public void setColour(final int colour) { @@ -221,7 +218,7 @@ public class Setting implements java.io.Serializable * Sets the value of field 'display'. * * @param display - * the value of field 'display'. + * the value of field 'display'. */ public void setDisplay(final boolean display) { @@ -233,7 +230,7 @@ public class Setting implements java.io.Serializable * Sets the value of field 'type'. * * @param type - * the value of field 'type'. + * the value of field 'type'. */ public void setType(final java.lang.String type) { @@ -245,11 +242,10 @@ public class Setting 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.Setting */ public static jalview.binding.Setting unmarshal( @@ -265,8 +261,7 @@ public class Setting 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 {