X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemabinding%2Fversion2%2FSetting.java;h=5cd78bd2fe299de81996af690a4abf27171754b6;hb=22d4d2237b099daf76bd1a2ed324763972ed91aa;hp=668ef9d655b3ff1b6e5891b9a7737a8271e31f7b;hpb=48df59aa393e03aa7269b2df662ac1b8d58cbb25;p=jalview.git

diff --git a/src/jalview/schemabinding/version2/Setting.java b/src/jalview/schemabinding/version2/Setting.java
index 668ef9d..5cd78bd 100755
--- a/src/jalview/schemabinding/version2/Setting.java
+++ b/src/jalview/schemabinding/version2/Setting.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 Setting.
@@ -34,12 +27,12 @@ public class Setting implements java.io.Serializable {
     //--------------------------/
 
     /**
-     * Field _type
+     * Field _type.
      */
     private java.lang.String _type;
 
     /**
-     * Field _colour
+     * Field _colour.
      */
     private int _colour;
 
@@ -49,7 +42,7 @@ public class Setting implements java.io.Serializable {
     private boolean _has_colour;
 
     /**
-     * Field _display
+     * Field _display.
      */
     private boolean _display;
 
@@ -58,6 +51,16 @@ public class Setting implements java.io.Serializable {
      */
     private boolean _has_display;
 
+    /**
+     * Field _order.
+     */
+    private float _order;
+
+    /**
+     * keeps track of state for field: _order
+     */
+    private boolean _has_order;
+
 
       //----------------/
      //- Constructors -/
@@ -65,7 +68,7 @@ public class Setting implements java.io.Serializable {
 
     public Setting() {
         super();
-    } //-- jalview.schemabinding.version2.Setting()
+    }
 
 
       //-----------/
@@ -73,181 +76,223 @@ public class Setting implements java.io.Serializable {
     //-----------/
 
     /**
-     * Method deleteColour
-     * 
      */
-    public void deleteColour()
-    {
+    public void deleteColour(
+    ) {
         this._has_colour= false;
-    } //-- void deleteColour() 
+    }
 
     /**
-     * Method deleteDisplay
-     * 
      */
-    public void deleteDisplay()
-    {
+    public void deleteDisplay(
+    ) {
         this._has_display= false;
-    } //-- void deleteDisplay() 
+    }
+
+    /**
+     */
+    public void deleteOrder(
+    ) {
+        this._has_order= false;
+    }
 
     /**
      * 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 'display'.
      * 
-     * @return boolean
-     * @return the value of field 'display'.
+     * @return the value of field 'Display'.
      */
-    public boolean getDisplay()
-    {
+    public boolean getDisplay(
+    ) {
         return this._display;
-    } //-- boolean getDisplay() 
+    }
+
+    /**
+     * Returns the value of field 'order'.
+     * 
+     * @return the value of field 'Order'.
+     */
+    public float getOrder(
+    ) {
+        return this._order;
+    }
 
     /**
      * Returns the value of field 'type'.
      * 
-     * @return String
-     * @return the value of field 'type'.
+     * @return the value of field 'Type'.
      */
-    public java.lang.String getType()
-    {
+    public java.lang.String getType(
+    ) {
         return this._type;
-    } //-- java.lang.String getType() 
+    }
 
     /**
-     * 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 hasDisplay
-     * 
-     * 
+     * Method hasDisplay.
      * 
-     * @return boolean
+     * @return true if at least one Display has been added
      */
-    public boolean hasDisplay()
-    {
+    public boolean hasDisplay(
+    ) {
         return this._has_display;
-    } //-- boolean hasDisplay() 
+    }
 
     /**
-     * Method isValid
+     * Method hasOrder.
      * 
+     * @return true if at least one Order has been added
+     */
+    public boolean hasOrder(
+    ) {
+        return this._has_order;
+    }
+
+    /**
+     * Returns the value of field 'display'.
      * 
+     * @return the value of field 'Display'.
+     */
+    public boolean isDisplay(
+    ) {
+        return this._display;
+    }
+
+    /**
+     * 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
+     * @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(java.io.Writer out)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
+    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
+     * @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(org.xml.sax.ContentHandler handler)
-        throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
+    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 'display'.
      * 
      * @param display the value of field 'display'.
      */
-    public void setDisplay(boolean display)
-    {
+    public void setDisplay(
+            final boolean display) {
         this._display = display;
         this._has_display = true;
-    } //-- void setDisplay(boolean) 
+    }
+
+    /**
+     * Sets the value of field 'order'.
+     * 
+     * @param order the value of field 'order'.
+     */
+    public void setOrder(
+            final float order) {
+        this._order = order;
+        this._has_order = true;
+    }
 
     /**
      * Sets the value of field 'type'.
      * 
      * @param type the value of field 'type'.
      */
-    public void setType(java.lang.String type)
-    {
+    public void setType(
+            final java.lang.String type) {
         this._type = type;
-    } //-- void setType(java.lang.String) 
+    }
 
     /**
-     * Method unmarshal
-     * 
-     * 
+     * Method unmarshal.
      * 
      * @param reader
-     * @return Object
+     * @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.Settin
      */
-    public static java.lang.Object unmarshal(java.io.Reader reader)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
+    public static jalview.schemabinding.version2.Setting unmarshal(
+            final java.io.Reader reader)
+    throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
         return (jalview.schemabinding.version2.Setting) Unmarshaller.unmarshal(jalview.schemabinding.version2.Setting.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() 
+    }
 
 }