X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbinding%2FAnnotationElement.java;h=16c3dab0c9962bcb27acfc8d0846ac61df915a20;hb=b8d09897dacc7b0ad203982b4578e2c1d8929142;hp=3c6eba4053d9deb192726137bbf134cb36ca0603;hpb=588042b69abf8e60bcc950b24c283933c7dd422f;p=jalview.git diff --git a/src/jalview/binding/AnnotationElement.java b/src/jalview/binding/AnnotationElement.java index 3c6eba4..16c3dab 100755 --- a/src/jalview/binding/AnnotationElement.java +++ b/src/jalview/binding/AnnotationElement.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; @@ -45,7 +27,8 @@ import java.io.Writer; * * @version $Revision$ $Date$ */ -public class AnnotationElement implements java.io.Serializable { +public class AnnotationElement implements java.io.Serializable +{ //--------------------------/ //- Class/Member Variables -/ //--------------------------/ @@ -88,25 +71,34 @@ public class AnnotationElement implements java.io.Serializable { //----------------/ //- Constructors -/ //----------------/ - public AnnotationElement() { + public AnnotationElement() + { super(); } - //-- jalview.binding.AnnotationElement() - //-----------/ - public void deletePosition() { + //-- jalview.binding.AnnotationElement() + //-----------/ + + /** + * DOCUMENT ME! + */ + public void deletePosition() + { this._has_position = false; } - //-- void deletePosition() + + //-- void deletePosition() /** * Method deleteValue * */ - public void deleteValue() { + public void deleteValue() + { this._has_value = false; } - //-- void deleteValue() + + //-- void deleteValue() /** * Returns the value of field 'description'. @@ -114,10 +106,12 @@ public class AnnotationElement implements java.io.Serializable { * @return String * @return the value of field 'description'. */ - public java.lang.String getDescription() { + public java.lang.String getDescription() + { return this._description; } - //-- java.lang.String getDescription() + + //-- java.lang.String getDescription() /** * Returns the value of field 'displayCharacter'. @@ -125,10 +119,12 @@ public class AnnotationElement implements java.io.Serializable { * @return String * @return the value of field 'displayCharacter'. */ - public java.lang.String getDisplayCharacter() { + public java.lang.String getDisplayCharacter() + { return this._displayCharacter; } - //-- java.lang.String getDisplayCharacter() + + //-- java.lang.String getDisplayCharacter() /** * Returns the value of field 'position'. @@ -136,10 +132,12 @@ public class AnnotationElement implements java.io.Serializable { * @return int * @return the value of field 'position'. */ - public int getPosition() { + public int getPosition() + { return this._position; } - //-- int getPosition() + + //-- int getPosition() /** * Returns the value of field 'secondaryStructure'. @@ -147,10 +145,12 @@ public class AnnotationElement implements java.io.Serializable { * @return String * @return the value of field 'secondaryStructure'. */ - public java.lang.String getSecondaryStructure() { + public java.lang.String getSecondaryStructure() + { return this._secondaryStructure; } - //-- java.lang.String getSecondaryStructure() + + //-- java.lang.String getSecondaryStructure() /** * Returns the value of field 'value'. @@ -158,10 +158,12 @@ public class AnnotationElement implements java.io.Serializable { * @return float * @return the value of field 'value'. */ - public float getValue() { + public float getValue() + { return this._value; } - //-- float getValue() + + //-- float getValue() /** * Method hasPosition @@ -170,10 +172,12 @@ public class AnnotationElement implements java.io.Serializable { * * @return boolean */ - public boolean hasPosition() { + public boolean hasPosition() + { return this._has_position; } - //-- boolean hasPosition() + + //-- boolean hasPosition() /** * Method hasValue @@ -182,10 +186,12 @@ public class AnnotationElement implements java.io.Serializable { * * @return boolean */ - public boolean hasValue() { + public boolean hasValue() + { return this._has_value; } - //-- boolean hasValue() + + //-- boolean hasValue() /** * Method isValid @@ -194,16 +200,21 @@ public class AnnotationElement 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 @@ -214,10 +225,12 @@ public class AnnotationElement 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 @@ -228,41 +241,49 @@ public class AnnotationElement 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 'description'. * * @param description the value of field 'description'. */ - public void setDescription(java.lang.String description) { + public void setDescription(java.lang.String description) + { this._description = description; } - //-- void setDescription(java.lang.String) + + //-- void setDescription(java.lang.String) /** * Sets the value of field 'displayCharacter'. * * @param displayCharacter the value of field 'displayCharacter' */ - public void setDisplayCharacter(java.lang.String displayCharacter) { + public void setDisplayCharacter(java.lang.String displayCharacter) + { this._displayCharacter = displayCharacter; } - //-- void setDisplayCharacter(java.lang.String) + + //-- void setDisplayCharacter(java.lang.String) /** * Sets the value of field 'position'. * * @param position the value of field 'position'. */ - public void setPosition(int position) { + public void setPosition(int position) + { this._position = position; this._has_position = true; } - //-- void setPosition(int) + + //-- void setPosition(int) /** * Sets the value of field 'secondaryStructure'. @@ -270,21 +291,25 @@ public class AnnotationElement implements java.io.Serializable { * @param secondaryStructure the value of field * 'secondaryStructure'. */ - public void setSecondaryStructure(java.lang.String secondaryStructure) { + public void setSecondaryStructure(java.lang.String secondaryStructure) + { this._secondaryStructure = secondaryStructure; } - //-- void setSecondaryStructure(java.lang.String) + + //-- void setSecondaryStructure(java.lang.String) /** * Sets the value of field 'value'. * * @param value the value of field 'value'. */ - public void setValue(float value) { + public void setValue(float value) + { this._value = value; this._has_value = true; } - //-- void setValue(float) + + //-- void setValue(float) /** * Method unmarshal @@ -296,19 +321,23 @@ public class AnnotationElement 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.AnnotationElement) Unmarshaller.unmarshal(jalview.binding.AnnotationElement.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() }