X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemabinding%2Fversion2%2FAnnotationElement.java;h=eca3e6a3838fe47a1552ff5dffa079ae0aebd7ec;hb=22d4d2237b099daf76bd1a2ed324763972ed91aa;hp=250719721779ee9fb115b447beaf8c2ea45adbfe;hpb=501657b3f11ab8e83271b6500375d8ae80b66c84;p=jalview.git

diff --git a/src/jalview/schemabinding/version2/AnnotationElement.java b/src/jalview/schemabinding/version2/AnnotationElement.java
index 2507197..eca3e6a 100755
--- a/src/jalview/schemabinding/version2/AnnotationElement.java
+++ b/src/jalview/schemabinding/version2/AnnotationElement.java
@@ -1,6 +1,6 @@
 /*
  * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML
+ * <a href="http://www.castor.org">Castor 1.1</a>, using an XML
  * Schema.
  * $Id$
  */
@@ -11,15 +11,8 @@ package jalview.schemabinding.version2;
  //- Imported classes and packages -/
 //---------------------------------/
 
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Serializable;
-import java.io.Writer;
-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 AnnotationElement.
@@ -34,7 +27,7 @@ public class AnnotationElement implements java.io.Serializable {
     //--------------------------/
 
     /**
-     * Field _position
+     * Field _position.
      */
     private int _position;
 
@@ -44,7 +37,7 @@ public class AnnotationElement implements java.io.Serializable {
     private boolean _has_position;
 
     /**
-     * Field _colour
+     * Field _colour.
      */
     private int _colour;
 
@@ -54,22 +47,22 @@ public class AnnotationElement implements java.io.Serializable {
     private boolean _has_colour;
 
     /**
-     * Field _displayCharacter
+     * Field _displayCharacter.
      */
     private java.lang.String _displayCharacter;
 
     /**
-     * Field _description
+     * Field _description.
      */
     private java.lang.String _description;
 
     /**
-     * Field _secondaryStructure
+     * Field _secondaryStructure.
      */
     private java.lang.String _secondaryStructure;
 
     /**
-     * Field _value
+     * Field _value.
      */
     private float _value;
 
@@ -85,7 +78,7 @@ public class AnnotationElement implements java.io.Serializable {
 
     public AnnotationElement() {
         super();
-    } //-- jalview.schemabinding.version2.AnnotationElement()
+    }
 
 
       //-----------/
@@ -93,221 +86,204 @@ public class AnnotationElement implements java.io.Serializable {
     //-----------/
 
     /**
-     * Method deleteColour
-     * 
      */
-    public void deleteColour()
-    {
+    public void deleteColour(
+    ) {
         this._has_colour= false;
-    } //-- void deleteColour() 
+    }
 
     /**
-     * Method deletePosition
-     * 
      */
-    public void deletePosition()
-    {
+    public void deletePosition(
+    ) {
         this._has_position= false;
-    } //-- void deletePosition() 
+    }
 
     /**
-     * Method deleteValue
-     * 
      */
-    public void deleteValue()
-    {
+    public void deleteValue(
+    ) {
         this._has_value= false;
-    } //-- void deleteValue() 
+    }
 
     /**
      * Returns the value of field 'colour'.
      * 
-     * @return int
-     * @return the value of field 'colour'.
+     * @return the value of field 'Colour'.
      */
-    public int getColour()
-    {
+    public int getColour(
+    ) {
         return this._colour;
-    } //-- int getColour() 
+    }
 
     /**
      * Returns the value of field 'description'.
      * 
-     * @return String
-     * @return the value of field 'description'.
+     * @return the value of field 'Description'.
      */
-    public java.lang.String getDescription()
-    {
+    public java.lang.String getDescription(
+    ) {
         return this._description;
-    } //-- java.lang.String getDescription() 
+    }
 
     /**
      * Returns the value of field 'displayCharacter'.
      * 
-     * @return String
-     * @return the value of field 'displayCharacter'.
+     * @return the value of field 'DisplayCharacter'.
      */
-    public java.lang.String getDisplayCharacter()
-    {
+    public java.lang.String getDisplayCharacter(
+    ) {
         return this._displayCharacter;
-    } //-- java.lang.String getDisplayCharacter() 
+    }
 
     /**
      * Returns the value of field 'position'.
      * 
-     * @return int
-     * @return the value of field 'position'.
+     * @return the value of field 'Position'.
      */
-    public int getPosition()
-    {
+    public int getPosition(
+    ) {
         return this._position;
-    } //-- int getPosition() 
+    }
 
     /**
      * Returns the value of field 'secondaryStructure'.
      * 
-     * @return String
-     * @return the value of field 'secondaryStructure'.
+     * @return the value of field 'SecondaryStructure'.
      */
-    public java.lang.String getSecondaryStructure()
-    {
+    public java.lang.String getSecondaryStructure(
+    ) {
         return this._secondaryStructure;
-    } //-- java.lang.String getSecondaryStructure() 
+    }
 
     /**
      * Returns the value of field 'value'.
      * 
-     * @return float
-     * @return the value of field 'value'.
+     * @return the value of field 'Value'.
      */
-    public float getValue()
-    {
+    public float getValue(
+    ) {
         return this._value;
-    } //-- float getValue() 
+    }
 
     /**
-     * Method hasColour
-     * 
-     * 
+     * Method hasColour.
      * 
-     * @return boolean
+     * @return true if at least one Colour has been added
      */
-    public boolean hasColour()
-    {
+    public boolean hasColour(
+    ) {
         return this._has_colour;
-    } //-- boolean hasColour() 
+    }
 
     /**
-     * Method hasPosition
+     * Method hasPosition.
      * 
-     * 
-     * 
-     * @return boolean
+     * @return true if at least one Position has been added
      */
-    public boolean hasPosition()
-    {
+    public boolean hasPosition(
+    ) {
         return this._has_position;
-    } //-- boolean hasPosition() 
+    }
 
     /**
-     * Method hasValue
-     * 
+     * Method hasValue.
      * 
-     * 
-     * @return boolean
+     * @return true if at least one Value has been added
      */
-    public boolean hasValue()
-    {
+    public boolean hasValue(
+    ) {
         return this._has_value;
-    } //-- boolean hasValue() 
+    }
 
     /**
-     * Method isValid
-     * 
+     * Method isValid.
      * 
-     * 
-     * @return boolean
+     * @return true if this object is valid according to the schema
      */
-    public boolean isValid()
-    {
+    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() 
+    }
 
     /**
-     * Method marshal
-     * 
      * 
      * 
      * @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 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
+     */
+    public void marshal(
+            final java.io.Writer out)
+    throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
         Marshaller.marshal(this, out);
-    } //-- void marshal(java.io.Writer) 
+    }
 
     /**
-     * Method marshal
-     * 
      * 
      * 
      * @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 if an IOException occurs during
+     * marshaling
+     * @throws org.exolab.castor.xml.ValidationException 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
+     */
+    public void marshal(
+            final org.xml.sax.ContentHandler handler)
+    throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
         Marshaller.marshal(this, handler);
-    } //-- void marshal(org.xml.sax.ContentHandler) 
+    }
 
     /**
      * Sets the value of field 'colour'.
      * 
      * @param colour the value of field 'colour'.
      */
-    public void setColour(int colour)
-    {
+    public void setColour(
+            final int colour) {
         this._colour = colour;
         this._has_colour = true;
-    } //-- void setColour(int) 
+    }
 
     /**
      * Sets the value of field 'description'.
      * 
      * @param description the value of field 'description'.
      */
-    public void setDescription(java.lang.String description)
-    {
+    public void setDescription(
+            final java.lang.String description) {
         this._description = description;
-    } //-- 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(
+            final java.lang.String displayCharacter) {
         this._displayCharacter = displayCharacter;
-    } //-- 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(
+            final int position) {
         this._position = position;
         this._has_position = true;
-    } //-- void setPosition(int) 
+    }
 
     /**
      * Sets the value of field 'secondaryStructure'.
@@ -315,45 +291,50 @@ public class AnnotationElement implements java.io.Serializable {
      * @param secondaryStructure the value of field
      * 'secondaryStructure'.
      */
-    public void setSecondaryStructure(java.lang.String secondaryStructure)
-    {
+    public void setSecondaryStructure(
+            final java.lang.String secondaryStructure) {
         this._secondaryStructure = secondaryStructure;
-    } //-- 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(
+            final float value) {
         this._value = value;
         this._has_value = true;
-    } //-- void setValue(float) 
+    }
 
     /**
-     * Method unmarshal
-     * 
-     * 
+     * Method unmarshal.
      * 
      * @param reader
-     * @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 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
+     * @return the unmarshaled
+     * jalview.schemabinding.version2.AnnotationElement
+     */
+    public static jalview.schemabinding.version2.AnnotationElement unmarshal(
+            final java.io.Reader reader)
+    throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
         return (jalview.schemabinding.version2.AnnotationElement) Unmarshaller.unmarshal(jalview.schemabinding.version2.AnnotationElement.class, reader);
-    } //-- java.lang.Object unmarshal(java.io.Reader) 
+    }
 
     /**
-     * Method validate
      * 
+     * 
+     * @throws org.exolab.castor.xml.ValidationException if this
+     * object is an invalid instance according to the schema
      */
-    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() 
+    }
 
 }