X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemabinding%2Fversion2%2FAnnotationColours.java;h=36f9f93864145654971ad07151d0851c8aafae6b;hb=cd07a161a10680208029f76aa46710c1032aae46;hp=b2af2c44febcaada5dda1ed272bceac3d34d30e5;hpb=224791537adfcd1d6efff3e24fa7c653d042b222;p=jalview.git

diff --git a/src/jalview/schemabinding/version2/AnnotationColours.java b/src/jalview/schemabinding/version2/AnnotationColours.java
index b2af2c4..36f9f93 100755
--- a/src/jalview/schemabinding/version2/AnnotationColours.java
+++ b/src/jalview/schemabinding/version2/AnnotationColours.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 AnnotationColours.
@@ -34,7 +27,7 @@ public class AnnotationColours implements java.io.Serializable {
     //--------------------------/
 
     /**
-     * Field _aboveThreshold
+     * Field _aboveThreshold.
      */
     private int _aboveThreshold;
 
@@ -44,12 +37,12 @@ public class AnnotationColours implements java.io.Serializable {
     private boolean _has_aboveThreshold;
 
     /**
-     * Field _annotation
+     * Field _annotation.
      */
     private java.lang.String _annotation;
 
     /**
-     * Field _minColour
+     * Field _minColour.
      */
     private int _minColour;
 
@@ -59,7 +52,7 @@ public class AnnotationColours implements java.io.Serializable {
     private boolean _has_minColour;
 
     /**
-     * Field _maxColour
+     * Field _maxColour.
      */
     private int _maxColour;
 
@@ -69,12 +62,12 @@ public class AnnotationColours implements java.io.Serializable {
     private boolean _has_maxColour;
 
     /**
-     * Field _colourScheme
+     * Field _colourScheme.
      */
     private java.lang.String _colourScheme;
 
     /**
-     * Field _threshold
+     * Field _threshold.
      */
     private float _threshold;
 
@@ -90,7 +83,7 @@ public class AnnotationColours implements java.io.Serializable {
 
     public AnnotationColours() {
         super();
-    } //-- jalview.schemabinding.version2.AnnotationColours()
+    }
 
 
       //-----------/
@@ -98,288 +91,272 @@ public class AnnotationColours implements java.io.Serializable {
     //-----------/
 
     /**
-     * Method deleteAboveThreshold
-     * 
      */
-    public void deleteAboveThreshold()
-    {
+    public void deleteAboveThreshold(
+    ) {
         this._has_aboveThreshold= false;
-    } //-- void deleteAboveThreshold() 
+    }
 
     /**
-     * Method deleteMaxColour
-     * 
      */
-    public void deleteMaxColour()
-    {
+    public void deleteMaxColour(
+    ) {
         this._has_maxColour= false;
-    } //-- void deleteMaxColour() 
+    }
 
     /**
-     * Method deleteMinColour
-     * 
      */
-    public void deleteMinColour()
-    {
+    public void deleteMinColour(
+    ) {
         this._has_minColour= false;
-    } //-- void deleteMinColour() 
+    }
 
     /**
-     * Method deleteThreshold
-     * 
      */
-    public void deleteThreshold()
-    {
+    public void deleteThreshold(
+    ) {
         this._has_threshold= false;
-    } //-- void deleteThreshold() 
+    }
 
     /**
      * Returns the value of field 'aboveThreshold'.
      * 
-     * @return int
-     * @return the value of field 'aboveThreshold'.
+     * @return the value of field 'AboveThreshold'.
      */
-    public int getAboveThreshold()
-    {
+    public int getAboveThreshold(
+    ) {
         return this._aboveThreshold;
-    } //-- int getAboveThreshold() 
+    }
 
     /**
      * Returns the value of field 'annotation'.
      * 
-     * @return String
-     * @return the value of field 'annotation'.
+     * @return the value of field 'Annotation'.
      */
-    public java.lang.String getAnnotation()
-    {
+    public java.lang.String getAnnotation(
+    ) {
         return this._annotation;
-    } //-- java.lang.String getAnnotation() 
+    }
 
     /**
      * Returns the value of field 'colourScheme'.
      * 
-     * @return String
-     * @return the value of field 'colourScheme'.
+     * @return the value of field 'ColourScheme'.
      */
-    public java.lang.String getColourScheme()
-    {
+    public java.lang.String getColourScheme(
+    ) {
         return this._colourScheme;
-    } //-- java.lang.String getColourScheme() 
+    }
 
     /**
      * Returns the value of field 'maxColour'.
      * 
-     * @return int
-     * @return the value of field 'maxColour'.
+     * @return the value of field 'MaxColour'.
      */
-    public int getMaxColour()
-    {
+    public int getMaxColour(
+    ) {
         return this._maxColour;
-    } //-- int getMaxColour() 
+    }
 
     /**
      * Returns the value of field 'minColour'.
      * 
-     * @return int
-     * @return the value of field 'minColour'.
+     * @return the value of field 'MinColour'.
      */
-    public int getMinColour()
-    {
+    public int getMinColour(
+    ) {
         return this._minColour;
-    } //-- int getMinColour() 
+    }
 
     /**
      * Returns the value of field 'threshold'.
      * 
-     * @return float
-     * @return the value of field 'threshold'.
+     * @return the value of field 'Threshold'.
      */
-    public float getThreshold()
-    {
+    public float getThreshold(
+    ) {
         return this._threshold;
-    } //-- float getThreshold() 
+    }
 
     /**
-     * Method hasAboveThreshold
-     * 
-     * 
+     * Method hasAboveThreshold.
      * 
-     * @return boolean
+     * @return true if at least one AboveThreshold has been added
      */
-    public boolean hasAboveThreshold()
-    {
+    public boolean hasAboveThreshold(
+    ) {
         return this._has_aboveThreshold;
-    } //-- boolean hasAboveThreshold() 
+    }
 
     /**
-     * Method hasMaxColour
+     * Method hasMaxColour.
      * 
-     * 
-     * 
-     * @return boolean
+     * @return true if at least one MaxColour has been added
      */
-    public boolean hasMaxColour()
-    {
+    public boolean hasMaxColour(
+    ) {
         return this._has_maxColour;
-    } //-- boolean hasMaxColour() 
+    }
 
     /**
-     * Method hasMinColour
-     * 
+     * Method hasMinColour.
      * 
-     * 
-     * @return boolean
+     * @return true if at least one MinColour has been added
      */
-    public boolean hasMinColour()
-    {
+    public boolean hasMinColour(
+    ) {
         return this._has_minColour;
-    } //-- boolean hasMinColour() 
+    }
 
     /**
-     * Method hasThreshold
-     * 
-     * 
+     * Method hasThreshold.
      * 
-     * @return boolean
+     * @return true if at least one Threshold has been added
      */
-    public boolean hasThreshold()
-    {
+    public boolean hasThreshold(
+    ) {
         return this._has_threshold;
-    } //-- boolean hasThreshold() 
+    }
 
     /**
-     * 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 'aboveThreshold'.
      * 
      * @param aboveThreshold the value of field 'aboveThreshold'.
      */
-    public void setAboveThreshold(int aboveThreshold)
-    {
+    public void setAboveThreshold(
+            final int aboveThreshold) {
         this._aboveThreshold = aboveThreshold;
         this._has_aboveThreshold = true;
-    } //-- void setAboveThreshold(int) 
+    }
 
     /**
      * Sets the value of field 'annotation'.
      * 
      * @param annotation the value of field 'annotation'.
      */
-    public void setAnnotation(java.lang.String annotation)
-    {
+    public void setAnnotation(
+            final java.lang.String annotation) {
         this._annotation = annotation;
-    } //-- void setAnnotation(java.lang.String) 
+    }
 
     /**
      * Sets the value of field 'colourScheme'.
      * 
      * @param colourScheme the value of field 'colourScheme'.
      */
-    public void setColourScheme(java.lang.String colourScheme)
-    {
+    public void setColourScheme(
+            final java.lang.String colourScheme) {
         this._colourScheme = colourScheme;
-    } //-- void setColourScheme(java.lang.String) 
+    }
 
     /**
      * Sets the value of field 'maxColour'.
      * 
      * @param maxColour the value of field 'maxColour'.
      */
-    public void setMaxColour(int maxColour)
-    {
+    public void setMaxColour(
+            final int maxColour) {
         this._maxColour = maxColour;
         this._has_maxColour = true;
-    } //-- void setMaxColour(int) 
+    }
 
     /**
      * Sets the value of field 'minColour'.
      * 
      * @param minColour the value of field 'minColour'.
      */
-    public void setMinColour(int minColour)
-    {
+    public void setMinColour(
+            final int minColour) {
         this._minColour = minColour;
         this._has_minColour = true;
-    } //-- void setMinColour(int) 
+    }
 
     /**
      * Sets the value of field 'threshold'.
      * 
      * @param threshold the value of field 'threshold'.
      */
-    public void setThreshold(float threshold)
-    {
+    public void setThreshold(
+            final float threshold) {
         this._threshold = threshold;
         this._has_threshold = true;
-    } //-- void setThreshold(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.AnnotationColours
+     */
+    public static jalview.schemabinding.version2.AnnotationColours unmarshal(
+            final java.io.Reader reader)
+    throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
         return (jalview.schemabinding.version2.AnnotationColours) Unmarshaller.unmarshal(jalview.schemabinding.version2.AnnotationColours.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() 
+    }
 
 }