extend XML model for graduated feature colours, group associated manual/auto annotati...
authorjprocter <Jim Procter>
Mon, 5 Apr 2010 15:34:09 +0000 (15:34 +0000)
committerjprocter <Jim Procter>
Mon, 5 Apr 2010 15:34:09 +0000 (15:34 +0000)
schemas/jalview.xsd
schemas/vamsas.xsd
src/jalview/schemabinding/version2/.castor.cdr
src/jalview/schemabinding/version2/Annotation.java
src/jalview/schemabinding/version2/JGroup.java
src/jalview/schemabinding/version2/Setting.java
src/jalview/schemabinding/version2/Viewport.java
src/jalview/schemabinding/version2/descriptors/AnnotationDescriptor.java
src/jalview/schemabinding/version2/descriptors/JGroupDescriptor.java
src/jalview/schemabinding/version2/descriptors/SettingDescriptor.java
src/jalview/schemabinding/version2/descriptors/ViewportDescriptor.java

index a0a167c..99a4e10 100755 (executable)
                                                <xs:attribute name="textCol2" type="xs:int"/>
                                                <xs:attribute name="textColThreshold" type="xs:int"/>
                                                <xs:attribute name="showUnconserved" type="xs:boolean" use="optional"/>
-                                               
+                                               <xs:attribute name="ignoreGapsinConsensus" type="xs:boolean" use="optional" default="true"/>
+                                               <xs:attribute name="showConsensusHistogram" type="xs:boolean" use="optional" default="true"/>
+                                               <xs:attribute name="showConsensusProfile" type="xs:boolean" use="optional" default="false"/>
+                                               <xs:attribute name="id" type="xs:string" use="optional"><xs:annotation>
+                                               <xs:documentation>
+                                               Optional sequence group ID (only needs to be unique for this alignment)
+                                               </xs:documentation>
+                                               </xs:annotation></xs:attribute>
                                        </xs:complexType>
                                </xs:element>
                                <xs:element name="Viewport" maxOccurs="unbounded">
                                                <xs:attribute name="rightAlignIds" type="xs:boolean"/>
                                                <xs:attribute name="showText" type="xs:boolean"/>
                                                <xs:attribute name="showColourText" type="xs:boolean"/>
-                                               <xs:attribute name="showUnconserved" type="xs:boolean" use="optional"/>
+                                               <xs:attribute name="showUnconserved" type="xs:boolean" use="optional" default="false"/>
                                                <xs:attribute name="showBoxes" type="xs:boolean"/>
                                                <xs:attribute name="wrapAlignment" type="xs:boolean"/>
                                                <xs:attribute name="renderGaps" type="xs:boolean"/>
                                                <xs:attribute name="showSequenceFeatures" type="xs:boolean"/>
+                                               <xs:attribute name="showNPfeatureTooltip" type="xs:boolean" use="optional"/>
+                                               <xs:attribute name="showDbRefTooltip" type="xs:boolean" use="optional"/>
+                                               <xs:attribute name="followHighlight" type="xs:boolean" use="optional" default="true"/>
+                                               <xs:attribute name="followSelection" type="xs:boolean" use="optional" default="true"/>
                                                <xs:attribute name="showAnnotation" type="xs:boolean"/>
+                                               <xs:attribute name="centreColumnLabels" type="xs:boolean" use="optional" default="false"/>
+                                               <xs:attribute name="showGroupConservation" type="xs:boolean" use="optional" default="false"/>
+                                               <xs:attribute name="showGroupConsensus" type="xs:boolean" use="optional" default="false"/>
+                                               <xs:attribute name="showConsensusHistogram" type="xs:boolean" use="optional" default="true"/>
+                                               <xs:attribute name="showConsensusProfile" type="xs:boolean" use="optional" default="false"/>
+                                               <xs:attribute name="ignoreGapsinConsensus" type="xs:boolean" use="optional" default="true"/>
+                                               
                                                <xs:attribute name="xpos" type="xs:int"/>
                                                <xs:attribute name="ypos" type="xs:int"/>
                                                <xs:attribute name="width" type="xs:int"/>
                                                                        <xs:attribute name="threshstate" type="xs:int" use="optional">
                                                                        <xs:annotation><xs:documentation>threshold type for graduated feature colour</xs:documentation>
                                                                        </xs:annotation></xs:attribute>
+                                                                       <xs:attribute name="max" type="xs:float" use="optional"/>
+                                                                       <xs:attribute name="min" type="xs:float" use="optional"/>
+                                                                       <xs:attribute name="colourByLabel" type="xs:boolean" use="optional"/>
+                                                                       <xs:attribute name="autoScale" type="xs:boolean" use="optional"/>
                                                        </xs:complexType>
                                                        </xs:element>
                                                        <xs:element name="group" minOccurs="0" maxOccurs="unbounded">
index e32427d..f438063 100755 (executable)
        <xs:element name="Annotation">
                <xs:complexType>
                        <xs:sequence>
-                               <xs:element ref="vamsas:annotationElement" minOccurs="0" maxOccurs="unbounded"/>
-                               <xs:element name="label" type="xs:string"/>
-                               <xs:element name="description" type="xs:string" minOccurs="0"/>
+                               <xs:element ref="vamsas:annotationElement" minOccurs="0"
+                                       maxOccurs="unbounded" />
+                               <xs:element name="label" type="xs:string" />
+                               <xs:element name="description" type="xs:string"
+                                       minOccurs="0" />
                                <xs:element name="thresholdLine" minOccurs="0">
                                        <xs:complexType>
-                                               <xs:attribute name="label" type="xs:string"/>
-                                               <xs:attribute name="value" type="xs:float"/>
-                                               <xs:attribute name="colour" type="xs:int"/>
+                                               <xs:attribute name="label" type="xs:string" />
+                                               <xs:attribute name="value" type="xs:float" />
+                                               <xs:attribute name="colour" type="xs:int" />
                                        </xs:complexType>
                                </xs:element>
                        </xs:sequence>
-                       <xs:attribute name="graph" type="xs:boolean" use="required"/>
-                       <xs:attribute name="graphType" type="xs:int" use="optional"/>
-                       <xs:attribute name="sequenceRef" type="xs:string" use="optional"/>
-                       <xs:attribute name="graphColour" type="xs:int" use="optional"/>
-                       <xs:attribute name="graphGroup" type="xs:int" use="optional"/>
-                       <xs:attribute name="id" type="xs:string" use="optional"/>
-                       <xs:attribute name="scoreOnly" type="xs:boolean" use="optional" default="false"/>
-                       <xs:attribute name="score" type="xs:double" use="optional"/>
-                       <xs:attribute name="visible" type="xs:boolean" use="optional"/>
+                       <xs:attribute name="graph" type="xs:boolean" use="required" />
+                       <xs:attribute name="graphType" type="xs:int" use="optional" />
+                       <xs:attribute name="sequenceRef" type="xs:string"
+                               use="optional" />
+                       <xs:attribute name="groupRef" type="xs:string"
+                               use="optional" />
+                       <xs:attribute name="graphColour" type="xs:int"
+                               use="optional" />
+                       <xs:attribute name="graphGroup" type="xs:int"
+                               use="optional" />
+                       <xs:attribute name="id" type="xs:string" use="optional" />
+                       <xs:attribute name="scoreOnly" type="xs:boolean"
+                               use="optional" default="false" />
+                       <xs:attribute name="score" type="xs:double" use="optional" />
+                       <xs:attribute name="visible" type="xs:boolean"
+                               use="optional" />
+                       <xs:attribute name="centreColLabels" type="xs:boolean"
+                               use="optional" />
+                       <xs:attribute name="scaleColLabels" type="xs:boolean"
+                               use="optional" />
+                       <xs:attribute name="showAllColLabels" type="xs:boolean"
+                               use="optional" />
+
+
+                       <xs:attribute name="autoCalculated" type="xs:boolean" use="optional" default="false">
+                       <xs:annotation><xs:documentation>is an autocalculated annotation row</xs:documentation>
+                       </xs:annotation></xs:attribute>
                </xs:complexType>
        </xs:element>   
        <xs:element name="SequenceSet">
index 9b9e3af..3c1ae95 100644 (file)
@@ -1,4 +1,4 @@
-#Fri Apr 02 15:31:06 BST 2010\r
+#Mon Apr 05 11:52:37 BST 2010\r
 jalview.schemabinding.version2.ThresholdLine=jalview.schemabinding.version2.descriptors.ThresholdLineDescriptor\r
 jalview.schemabinding.version2.SequenceSetProperties=jalview.schemabinding.version2.descriptors.SequenceSetPropertiesDescriptor\r
 jalview.schemabinding.version2.StructureState=jalview.schemabinding.version2.descriptors.StructureStateDescriptor\r
@@ -33,12 +33,12 @@ jalview.schemabinding.version2.MapListFrom=jalview.schemabinding.version2.descri
 jalview.schemabinding.version2.PdbentryItem=jalview.schemabinding.version2.descriptors.PdbentryItemDescriptor\r
 jalview.schemabinding.version2.FeatureSettings=jalview.schemabinding.version2.descriptors.FeatureSettingsDescriptor\r
 jalview.schemabinding.version2.JGroup=jalview.schemabinding.version2.descriptors.JGroupDescriptor\r
-jalview.schemabinding.version2.MapListTo=jalview.schemabinding.version2.descriptors.MapListToDescriptor\r
-jalview.schemabinding.version2.JalviewUserColours=jalview.schemabinding.version2.descriptors.JalviewUserColoursDescriptor\r
 jalview.schemabinding.version2.VamsasModel=jalview.schemabinding.version2.descriptors.VamsasModelDescriptor\r
+jalview.schemabinding.version2.JalviewUserColours=jalview.schemabinding.version2.descriptors.JalviewUserColoursDescriptor\r
+jalview.schemabinding.version2.MapListTo=jalview.schemabinding.version2.descriptors.MapListToDescriptor\r
 jalview.schemabinding.version2.Pdbentry=jalview.schemabinding.version2.descriptors.PdbentryDescriptor\r
 jalview.schemabinding.version2.HiddenColumns=jalview.schemabinding.version2.descriptors.HiddenColumnsDescriptor\r
-jalview.schemabinding.version2.DseqFor=jalview.schemabinding.version2.descriptors.DseqForDescriptor\r
 jalview.schemabinding.version2.Features=jalview.schemabinding.version2.descriptors.FeaturesDescriptor\r
+jalview.schemabinding.version2.DseqFor=jalview.schemabinding.version2.descriptors.DseqForDescriptor\r
 jalview.schemabinding.version2.VAMSAS=jalview.schemabinding.version2.descriptors.VAMSASDescriptor\r
 jalview.schemabinding.version2.MappingChoiceItem=jalview.schemabinding.version2.descriptors.MappingChoiceItemDescriptor\r
index 1649f20..b7056c4 100755 (executable)
@@ -63,6 +63,11 @@ public class Annotation implements java.io.Serializable {
     private java.lang.String _sequenceRef;\r
 \r
     /**\r
+     * Field _groupRef.\r
+     */\r
+    private java.lang.String _groupRef;\r
+\r
+    /**\r
      * Field _graphColour.\r
      */\r
     private int _graphColour;\r
@@ -118,6 +123,46 @@ public class Annotation implements java.io.Serializable {
     private boolean _has_visible;\r
 \r
     /**\r
+     * Field _centreColLabels.\r
+     */\r
+    private boolean _centreColLabels;\r
+\r
+    /**\r
+     * keeps track of state for field: _centreColLabels\r
+     */\r
+    private boolean _has_centreColLabels;\r
+\r
+    /**\r
+     * Field _scaleColLabels.\r
+     */\r
+    private boolean _scaleColLabels;\r
+\r
+    /**\r
+     * keeps track of state for field: _scaleColLabels\r
+     */\r
+    private boolean _has_scaleColLabels;\r
+\r
+    /**\r
+     * Field _showAllColLabels.\r
+     */\r
+    private boolean _showAllColLabels;\r
+\r
+    /**\r
+     * keeps track of state for field: _showAllColLabels\r
+     */\r
+    private boolean _has_showAllColLabels;\r
+\r
+    /**\r
+     * is an autocalculated annotation row\r
+     */\r
+    private boolean _autoCalculated = false;\r
+\r
+    /**\r
+     * keeps track of state for field: _autoCalculated\r
+     */\r
+    private boolean _has_autoCalculated;\r
+\r
+    /**\r
      * Field _annotationElementList.\r
      */\r
     private java.util.Vector _annotationElementList;\r
@@ -182,6 +227,20 @@ public class Annotation implements java.io.Serializable {
 \r
     /**\r
      */\r
+    public void deleteAutoCalculated(\r
+    ) {\r
+        this._has_autoCalculated= false;\r
+    }\r
+\r
+    /**\r
+     */\r
+    public void deleteCentreColLabels(\r
+    ) {\r
+        this._has_centreColLabels= false;\r
+    }\r
+\r
+    /**\r
+     */\r
     public void deleteGraph(\r
     ) {\r
         this._has_graph= false;\r
@@ -210,6 +269,13 @@ public class Annotation implements java.io.Serializable {
 \r
     /**\r
      */\r
+    public void deleteScaleColLabels(\r
+    ) {\r
+        this._has_scaleColLabels= false;\r
+    }\r
+\r
+    /**\r
+     */\r
     public void deleteScore(\r
     ) {\r
         this._has_score= false;\r
@@ -224,6 +290,13 @@ public class Annotation implements java.io.Serializable {
 \r
     /**\r
      */\r
+    public void deleteShowAllColLabels(\r
+    ) {\r
+        this._has_showAllColLabels= false;\r
+    }\r
+\r
+    /**\r
+     */\r
     public void deleteVisible(\r
     ) {\r
         this._has_visible= false;\r
@@ -288,6 +361,28 @@ public class Annotation implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'autoCalculated'. The field\r
+     * 'autoCalculated' has the following description: is an\r
+     * autocalculated annotation row\r
+     * \r
+     * @return the value of field 'AutoCalculated'.\r
+     */\r
+    public boolean getAutoCalculated(\r
+    ) {\r
+        return this._autoCalculated;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'centreColLabels'.\r
+     * \r
+     * @return the value of field 'CentreColLabels'.\r
+     */\r
+    public boolean getCentreColLabels(\r
+    ) {\r
+        return this._centreColLabels;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'description'.\r
      * \r
      * @return the value of field 'Description'.\r
@@ -338,6 +433,16 @@ public class Annotation implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'groupRef'.\r
+     * \r
+     * @return the value of field 'GroupRef'.\r
+     */\r
+    public java.lang.String getGroupRef(\r
+    ) {\r
+        return this._groupRef;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'id'.\r
      * \r
      * @return the value of field 'Id'.\r
@@ -358,6 +463,16 @@ public class Annotation implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'scaleColLabels'.\r
+     * \r
+     * @return the value of field 'ScaleColLabels'.\r
+     */\r
+    public boolean getScaleColLabels(\r
+    ) {\r
+        return this._scaleColLabels;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'score'.\r
      * \r
      * @return the value of field 'Score'.\r
@@ -388,6 +503,16 @@ public class Annotation implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'showAllColLabels'.\r
+     * \r
+     * @return the value of field 'ShowAllColLabels'.\r
+     */\r
+    public boolean getShowAllColLabels(\r
+    ) {\r
+        return this._showAllColLabels;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'thresholdLine'.\r
      * \r
      * @return the value of field 'ThresholdLine'.\r
@@ -408,6 +533,26 @@ public class Annotation implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Method hasAutoCalculated.\r
+     * \r
+     * @return true if at least one AutoCalculated has been added\r
+     */\r
+    public boolean hasAutoCalculated(\r
+    ) {\r
+        return this._has_autoCalculated;\r
+    }\r
+\r
+    /**\r
+     * Method hasCentreColLabels.\r
+     * \r
+     * @return true if at least one CentreColLabels has been added\r
+     */\r
+    public boolean hasCentreColLabels(\r
+    ) {\r
+        return this._has_centreColLabels;\r
+    }\r
+\r
+    /**\r
      * Method hasGraph.\r
      * \r
      * @return true if at least one Graph has been added\r
@@ -448,6 +593,16 @@ public class Annotation implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Method hasScaleColLabels.\r
+     * \r
+     * @return true if at least one ScaleColLabels has been added\r
+     */\r
+    public boolean hasScaleColLabels(\r
+    ) {\r
+        return this._has_scaleColLabels;\r
+    }\r
+\r
+    /**\r
      * Method hasScore.\r
      * \r
      * @return true if at least one Score has been added\r
@@ -468,6 +623,16 @@ public class Annotation implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Method hasShowAllColLabels.\r
+     * \r
+     * @return true if at least one ShowAllColLabels has been added\r
+     */\r
+    public boolean hasShowAllColLabels(\r
+    ) {\r
+        return this._has_showAllColLabels;\r
+    }\r
+\r
+    /**\r
      * Method hasVisible.\r
      * \r
      * @return true if at least one Visible has been added\r
@@ -478,6 +643,28 @@ public class Annotation implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'autoCalculated'. The field\r
+     * 'autoCalculated' has the following description: is an\r
+     * autocalculated annotation row\r
+     * \r
+     * @return the value of field 'AutoCalculated'.\r
+     */\r
+    public boolean isAutoCalculated(\r
+    ) {\r
+        return this._autoCalculated;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'centreColLabels'.\r
+     * \r
+     * @return the value of field 'CentreColLabels'.\r
+     */\r
+    public boolean isCentreColLabels(\r
+    ) {\r
+        return this._centreColLabels;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'graph'.\r
      * \r
      * @return the value of field 'Graph'.\r
@@ -488,6 +675,16 @@ public class Annotation implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'scaleColLabels'.\r
+     * \r
+     * @return the value of field 'ScaleColLabels'.\r
+     */\r
+    public boolean isScaleColLabels(\r
+    ) {\r
+        return this._scaleColLabels;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'scoreOnly'.\r
      * \r
      * @return the value of field 'ScoreOnly'.\r
@@ -498,6 +695,16 @@ public class Annotation implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'showAllColLabels'.\r
+     * \r
+     * @return the value of field 'ShowAllColLabels'.\r
+     */\r
+    public boolean isShowAllColLabels(\r
+    ) {\r
+        return this._showAllColLabels;\r
+    }\r
+\r
+    /**\r
      * Method isValid.\r
      * \r
      * @return true if this object is valid according to the schema\r
@@ -621,6 +828,30 @@ public class Annotation implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Sets the value of field 'autoCalculated'. The field\r
+     * 'autoCalculated' has the following description: is an\r
+     * autocalculated annotation row\r
+     * \r
+     * @param autoCalculated the value of field 'autoCalculated'.\r
+     */\r
+    public void setAutoCalculated(\r
+            final boolean autoCalculated) {\r
+        this._autoCalculated = autoCalculated;\r
+        this._has_autoCalculated = true;\r
+    }\r
+\r
+    /**\r
+     * Sets the value of field 'centreColLabels'.\r
+     * \r
+     * @param centreColLabels the value of field 'centreColLabels'.\r
+     */\r
+    public void setCentreColLabels(\r
+            final boolean centreColLabels) {\r
+        this._centreColLabels = centreColLabels;\r
+        this._has_centreColLabels = true;\r
+    }\r
+\r
+    /**\r
      * Sets the value of field 'description'.\r
      * \r
      * @param description the value of field 'description'.\r
@@ -675,6 +906,16 @@ public class Annotation implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Sets the value of field 'groupRef'.\r
+     * \r
+     * @param groupRef the value of field 'groupRef'.\r
+     */\r
+    public void setGroupRef(\r
+            final java.lang.String groupRef) {\r
+        this._groupRef = groupRef;\r
+    }\r
+\r
+    /**\r
      * Sets the value of field 'id'.\r
      * \r
      * @param id the value of field 'id'.\r
@@ -695,6 +936,17 @@ public class Annotation implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Sets the value of field 'scaleColLabels'.\r
+     * \r
+     * @param scaleColLabels the value of field 'scaleColLabels'.\r
+     */\r
+    public void setScaleColLabels(\r
+            final boolean scaleColLabels) {\r
+        this._scaleColLabels = scaleColLabels;\r
+        this._has_scaleColLabels = true;\r
+    }\r
+\r
+    /**\r
      * Sets the value of field 'score'.\r
      * \r
      * @param score the value of field 'score'.\r
@@ -727,6 +979,17 @@ public class Annotation implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Sets the value of field 'showAllColLabels'.\r
+     * \r
+     * @param showAllColLabels the value of field 'showAllColLabels'\r
+     */\r
+    public void setShowAllColLabels(\r
+            final boolean showAllColLabels) {\r
+        this._showAllColLabels = showAllColLabels;\r
+        this._has_showAllColLabels = true;\r
+    }\r
+\r
+    /**\r
      * Sets the value of field 'thresholdLine'.\r
      * \r
      * @param thresholdLine the value of field 'thresholdLine'.\r
index f4df22b..c25de2b 100755 (executable)
@@ -168,6 +168,43 @@ public class JGroup implements java.io.Serializable {
     private boolean _has_showUnconserved;\r
 \r
     /**\r
+     * Field _ignoreGapsinConsensus.\r
+     */\r
+    private boolean _ignoreGapsinConsensus = true;\r
+\r
+    /**\r
+     * keeps track of state for field: _ignoreGapsinConsensus\r
+     */\r
+    private boolean _has_ignoreGapsinConsensus;\r
+\r
+    /**\r
+     * Field _showConsensusHistogram.\r
+     */\r
+    private boolean _showConsensusHistogram = true;\r
+\r
+    /**\r
+     * keeps track of state for field: _showConsensusHistogram\r
+     */\r
+    private boolean _has_showConsensusHistogram;\r
+\r
+    /**\r
+     * Field _showConsensusProfile.\r
+     */\r
+    private boolean _showConsensusProfile = false;\r
+\r
+    /**\r
+     * keeps track of state for field: _showConsensusProfile\r
+     */\r
+    private boolean _has_showConsensusProfile;\r
+\r
+    /**\r
+     * Optional sequence group ID (only needs to be unique for this\r
+     * alignment)\r
+     *  \r
+     */\r
+    private java.lang.String _id;\r
+\r
+    /**\r
      * Field _seqList.\r
      */\r
     private java.util.Vector _seqList;\r
@@ -252,6 +289,13 @@ public class JGroup implements java.io.Serializable {
 \r
     /**\r
      */\r
+    public void deleteIgnoreGapsinConsensus(\r
+    ) {\r
+        this._has_ignoreGapsinConsensus= false;\r
+    }\r
+\r
+    /**\r
+     */\r
     public void deleteOutlineColour(\r
     ) {\r
         this._has_outlineColour= false;\r
@@ -266,6 +310,20 @@ public class JGroup implements java.io.Serializable {
 \r
     /**\r
      */\r
+    public void deleteShowConsensusHistogram(\r
+    ) {\r
+        this._has_showConsensusHistogram= false;\r
+    }\r
+\r
+    /**\r
+     */\r
+    public void deleteShowConsensusProfile(\r
+    ) {\r
+        this._has_showConsensusProfile= false;\r
+    }\r
+\r
+    /**\r
+     */\r
     public void deleteShowUnconserved(\r
     ) {\r
         this._has_showUnconserved= false;\r
@@ -370,6 +428,29 @@ public class JGroup implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'id'. The field 'id' has the\r
+     * following description: Optional sequence group ID (only\r
+     * needs to be unique for this alignment)\r
+     *  \r
+     * \r
+     * @return the value of field 'Id'.\r
+     */\r
+    public java.lang.String getId(\r
+    ) {\r
+        return this._id;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'ignoreGapsinConsensus'.\r
+     * \r
+     * @return the value of field 'IgnoreGapsinConsensus'.\r
+     */\r
+    public boolean getIgnoreGapsinConsensus(\r
+    ) {\r
+        return this._ignoreGapsinConsensus;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'name'.\r
      * \r
      * @return the value of field 'Name'.\r
@@ -444,6 +525,26 @@ public class JGroup implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'showConsensusHistogram'.\r
+     * \r
+     * @return the value of field 'ShowConsensusHistogram'.\r
+     */\r
+    public boolean getShowConsensusHistogram(\r
+    ) {\r
+        return this._showConsensusHistogram;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'showConsensusProfile'.\r
+     * \r
+     * @return the value of field 'ShowConsensusProfile'.\r
+     */\r
+    public boolean getShowConsensusProfile(\r
+    ) {\r
+        return this._showConsensusProfile;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'showUnconserved'.\r
      * \r
      * @return the value of field 'ShowUnconserved'.\r
@@ -544,6 +645,17 @@ public class JGroup implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Method hasIgnoreGapsinConsensus.\r
+     * \r
+     * @return true if at least one IgnoreGapsinConsensus has been\r
+     * added\r
+     */\r
+    public boolean hasIgnoreGapsinConsensus(\r
+    ) {\r
+        return this._has_ignoreGapsinConsensus;\r
+    }\r
+\r
+    /**\r
      * Method hasOutlineColour.\r
      * \r
      * @return true if at least one OutlineColour has been added\r
@@ -564,6 +676,28 @@ public class JGroup implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Method hasShowConsensusHistogram.\r
+     * \r
+     * @return true if at least one ShowConsensusHistogram has been\r
+     * added\r
+     */\r
+    public boolean hasShowConsensusHistogram(\r
+    ) {\r
+        return this._has_showConsensusHistogram;\r
+    }\r
+\r
+    /**\r
+     * Method hasShowConsensusProfile.\r
+     * \r
+     * @return true if at least one ShowConsensusProfile has been\r
+     * added\r
+     */\r
+    public boolean hasShowConsensusProfile(\r
+    ) {\r
+        return this._has_showConsensusProfile;\r
+    }\r
+\r
+    /**\r
      * Method hasShowUnconserved.\r
      * \r
      * @return true if at least one ShowUnconserved has been added\r
@@ -644,6 +778,36 @@ public class JGroup implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'ignoreGapsinConsensus'.\r
+     * \r
+     * @return the value of field 'IgnoreGapsinConsensus'.\r
+     */\r
+    public boolean isIgnoreGapsinConsensus(\r
+    ) {\r
+        return this._ignoreGapsinConsensus;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'showConsensusHistogram'.\r
+     * \r
+     * @return the value of field 'ShowConsensusHistogram'.\r
+     */\r
+    public boolean isShowConsensusHistogram(\r
+    ) {\r
+        return this._showConsensusHistogram;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'showConsensusProfile'.\r
+     * \r
+     * @return the value of field 'ShowConsensusProfile'.\r
+     */\r
+    public boolean isShowConsensusProfile(\r
+    ) {\r
+        return this._showConsensusProfile;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'showUnconserved'.\r
      * \r
      * @return the value of field 'ShowUnconserved'.\r
@@ -797,6 +961,31 @@ public class JGroup implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Sets the value of field 'id'. The field 'id' has the\r
+     * following description: Optional sequence group ID (only\r
+     * needs to be unique for this alignment)\r
+     *  \r
+     * \r
+     * @param id the value of field 'id'.\r
+     */\r
+    public void setId(\r
+            final java.lang.String id) {\r
+        this._id = id;\r
+    }\r
+\r
+    /**\r
+     * Sets the value of field 'ignoreGapsinConsensus'.\r
+     * \r
+     * @param ignoreGapsinConsensus the value of field\r
+     * 'ignoreGapsinConsensus'.\r
+     */\r
+    public void setIgnoreGapsinConsensus(\r
+            final boolean ignoreGapsinConsensus) {\r
+        this._ignoreGapsinConsensus = ignoreGapsinConsensus;\r
+        this._has_ignoreGapsinConsensus = true;\r
+    }\r
+\r
+    /**\r
      * Sets the value of field 'name'.\r
      * \r
      * @param name the value of field 'name'.\r
@@ -864,6 +1053,30 @@ public class JGroup implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Sets the value of field 'showConsensusHistogram'.\r
+     * \r
+     * @param showConsensusHistogram the value of field\r
+     * 'showConsensusHistogram'.\r
+     */\r
+    public void setShowConsensusHistogram(\r
+            final boolean showConsensusHistogram) {\r
+        this._showConsensusHistogram = showConsensusHistogram;\r
+        this._has_showConsensusHistogram = true;\r
+    }\r
+\r
+    /**\r
+     * Sets the value of field 'showConsensusProfile'.\r
+     * \r
+     * @param showConsensusProfile the value of field\r
+     * 'showConsensusProfile'.\r
+     */\r
+    public void setShowConsensusProfile(\r
+            final boolean showConsensusProfile) {\r
+        this._showConsensusProfile = showConsensusProfile;\r
+        this._has_showConsensusProfile = true;\r
+    }\r
+\r
+    /**\r
      * Sets the value of field 'showUnconserved'.\r
      * \r
      * @param showUnconserved the value of field 'showUnconserved'.\r
index 2aa0341..a221125 100755 (executable)
@@ -102,6 +102,46 @@ public class Setting implements java.io.Serializable {
      */\r
     private boolean _has_threshstate;\r
 \r
+    /**\r
+     * Field _max.\r
+     */\r
+    private float _max;\r
+\r
+    /**\r
+     * keeps track of state for field: _max\r
+     */\r
+    private boolean _has_max;\r
+\r
+    /**\r
+     * Field _min.\r
+     */\r
+    private float _min;\r
+\r
+    /**\r
+     * keeps track of state for field: _min\r
+     */\r
+    private boolean _has_min;\r
+\r
+    /**\r
+     * Field _colourByLabel.\r
+     */\r
+    private boolean _colourByLabel;\r
+\r
+    /**\r
+     * keeps track of state for field: _colourByLabel\r
+     */\r
+    private boolean _has_colourByLabel;\r
+\r
+    /**\r
+     * Field _autoScale.\r
+     */\r
+    private boolean _autoScale;\r
+\r
+    /**\r
+     * keeps track of state for field: _autoScale\r
+     */\r
+    private boolean _has_autoScale;\r
+\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -118,6 +158,13 @@ public class Setting implements java.io.Serializable {
 \r
     /**\r
      */\r
+    public void deleteAutoScale(\r
+    ) {\r
+        this._has_autoScale= false;\r
+    }\r
+\r
+    /**\r
+     */\r
     public void deleteColour(\r
     ) {\r
         this._has_colour= false;\r
@@ -125,6 +172,13 @@ public class Setting implements java.io.Serializable {
 \r
     /**\r
      */\r
+    public void deleteColourByLabel(\r
+    ) {\r
+        this._has_colourByLabel= false;\r
+    }\r
+\r
+    /**\r
+     */\r
     public void deleteDisplay(\r
     ) {\r
         this._has_display= false;\r
@@ -132,6 +186,20 @@ public class Setting implements java.io.Serializable {
 \r
     /**\r
      */\r
+    public void deleteMax(\r
+    ) {\r
+        this._has_max= false;\r
+    }\r
+\r
+    /**\r
+     */\r
+    public void deleteMin(\r
+    ) {\r
+        this._has_min= false;\r
+    }\r
+\r
+    /**\r
+     */\r
     public void deleteMincolour(\r
     ) {\r
         this._has_mincolour= false;\r
@@ -159,6 +227,16 @@ public class Setting implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'autoScale'.\r
+     * \r
+     * @return the value of field 'AutoScale'.\r
+     */\r
+    public boolean getAutoScale(\r
+    ) {\r
+        return this._autoScale;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'colour'.\r
      * \r
      * @return the value of field 'Colour'.\r
@@ -169,6 +247,16 @@ public class Setting implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'colourByLabel'.\r
+     * \r
+     * @return the value of field 'ColourByLabel'.\r
+     */\r
+    public boolean getColourByLabel(\r
+    ) {\r
+        return this._colourByLabel;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'display'.\r
      * \r
      * @return the value of field 'Display'.\r
@@ -179,6 +267,26 @@ public class Setting implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'max'.\r
+     * \r
+     * @return the value of field 'Max'.\r
+     */\r
+    public float getMax(\r
+    ) {\r
+        return this._max;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'min'.\r
+     * \r
+     * @return the value of field 'Min'.\r
+     */\r
+    public float getMin(\r
+    ) {\r
+        return this._min;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'mincolour'. The field\r
      * 'mincolour' has the following description: Optional minimum\r
      * colour for graduated feature colour\r
@@ -235,6 +343,16 @@ public class Setting implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Method hasAutoScale.\r
+     * \r
+     * @return true if at least one AutoScale has been added\r
+     */\r
+    public boolean hasAutoScale(\r
+    ) {\r
+        return this._has_autoScale;\r
+    }\r
+\r
+    /**\r
      * Method hasColour.\r
      * \r
      * @return true if at least one Colour has been added\r
@@ -245,6 +363,16 @@ public class Setting implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Method hasColourByLabel.\r
+     * \r
+     * @return true if at least one ColourByLabel has been added\r
+     */\r
+    public boolean hasColourByLabel(\r
+    ) {\r
+        return this._has_colourByLabel;\r
+    }\r
+\r
+    /**\r
      * Method hasDisplay.\r
      * \r
      * @return true if at least one Display has been added\r
@@ -255,6 +383,26 @@ public class Setting implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Method hasMax.\r
+     * \r
+     * @return true if at least one Max has been added\r
+     */\r
+    public boolean hasMax(\r
+    ) {\r
+        return this._has_max;\r
+    }\r
+\r
+    /**\r
+     * Method hasMin.\r
+     * \r
+     * @return true if at least one Min has been added\r
+     */\r
+    public boolean hasMin(\r
+    ) {\r
+        return this._has_min;\r
+    }\r
+\r
+    /**\r
      * Method hasMincolour.\r
      * \r
      * @return true if at least one Mincolour has been added\r
@@ -295,6 +443,26 @@ public class Setting implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'autoScale'.\r
+     * \r
+     * @return the value of field 'AutoScale'.\r
+     */\r
+    public boolean isAutoScale(\r
+    ) {\r
+        return this._autoScale;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'colourByLabel'.\r
+     * \r
+     * @return the value of field 'ColourByLabel'.\r
+     */\r
+    public boolean isColourByLabel(\r
+    ) {\r
+        return this._colourByLabel;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'display'.\r
      * \r
      * @return the value of field 'Display'.\r
@@ -352,6 +520,17 @@ public class Setting implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Sets the value of field 'autoScale'.\r
+     * \r
+     * @param autoScale the value of field 'autoScale'.\r
+     */\r
+    public void setAutoScale(\r
+            final boolean autoScale) {\r
+        this._autoScale = autoScale;\r
+        this._has_autoScale = true;\r
+    }\r
+\r
+    /**\r
      * Sets the value of field 'colour'.\r
      * \r
      * @param colour the value of field 'colour'.\r
@@ -363,6 +542,17 @@ public class Setting implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Sets the value of field 'colourByLabel'.\r
+     * \r
+     * @param colourByLabel the value of field 'colourByLabel'.\r
+     */\r
+    public void setColourByLabel(\r
+            final boolean colourByLabel) {\r
+        this._colourByLabel = colourByLabel;\r
+        this._has_colourByLabel = true;\r
+    }\r
+\r
+    /**\r
      * Sets the value of field 'display'.\r
      * \r
      * @param display the value of field 'display'.\r
@@ -374,6 +564,28 @@ public class Setting implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Sets the value of field 'max'.\r
+     * \r
+     * @param max the value of field 'max'.\r
+     */\r
+    public void setMax(\r
+            final float max) {\r
+        this._max = max;\r
+        this._has_max = true;\r
+    }\r
+\r
+    /**\r
+     * Sets the value of field 'min'.\r
+     * \r
+     * @param min the value of field 'min'.\r
+     */\r
+    public void setMin(\r
+            final float min) {\r
+        this._min = min;\r
+        this._has_min = true;\r
+    }\r
+\r
+    /**\r
      * Sets the value of field 'mincolour'. The field 'mincolour'\r
      * has the following description: Optional minimum colour for\r
      * graduated feature colour\r
index 6cfe996..7dbeedd 100755 (executable)
@@ -130,7 +130,7 @@ public class Viewport implements java.io.Serializable {
     /**\r
      * Field _showUnconserved.\r
      */\r
-    private boolean _showUnconserved;\r
+    private boolean _showUnconserved = false;\r
 \r
     /**\r
      * keeps track of state for field: _showUnconserved\r
@@ -178,6 +178,46 @@ public class Viewport implements java.io.Serializable {
     private boolean _has_showSequenceFeatures;\r
 \r
     /**\r
+     * Field _showNPfeatureTooltip.\r
+     */\r
+    private boolean _showNPfeatureTooltip;\r
+\r
+    /**\r
+     * keeps track of state for field: _showNPfeatureTooltip\r
+     */\r
+    private boolean _has_showNPfeatureTooltip;\r
+\r
+    /**\r
+     * Field _showDbRefTooltip.\r
+     */\r
+    private boolean _showDbRefTooltip;\r
+\r
+    /**\r
+     * keeps track of state for field: _showDbRefTooltip\r
+     */\r
+    private boolean _has_showDbRefTooltip;\r
+\r
+    /**\r
+     * Field _followHighlight.\r
+     */\r
+    private boolean _followHighlight = true;\r
+\r
+    /**\r
+     * keeps track of state for field: _followHighlight\r
+     */\r
+    private boolean _has_followHighlight;\r
+\r
+    /**\r
+     * Field _followSelection.\r
+     */\r
+    private boolean _followSelection = true;\r
+\r
+    /**\r
+     * keeps track of state for field: _followSelection\r
+     */\r
+    private boolean _has_followSelection;\r
+\r
+    /**\r
      * Field _showAnnotation.\r
      */\r
     private boolean _showAnnotation;\r
@@ -188,6 +228,66 @@ public class Viewport implements java.io.Serializable {
     private boolean _has_showAnnotation;\r
 \r
     /**\r
+     * Field _centreColumnLabels.\r
+     */\r
+    private boolean _centreColumnLabels = false;\r
+\r
+    /**\r
+     * keeps track of state for field: _centreColumnLabels\r
+     */\r
+    private boolean _has_centreColumnLabels;\r
+\r
+    /**\r
+     * Field _showGroupConservation.\r
+     */\r
+    private boolean _showGroupConservation = false;\r
+\r
+    /**\r
+     * keeps track of state for field: _showGroupConservation\r
+     */\r
+    private boolean _has_showGroupConservation;\r
+\r
+    /**\r
+     * Field _showGroupConsensus.\r
+     */\r
+    private boolean _showGroupConsensus = false;\r
+\r
+    /**\r
+     * keeps track of state for field: _showGroupConsensus\r
+     */\r
+    private boolean _has_showGroupConsensus;\r
+\r
+    /**\r
+     * Field _showConsensusHistogram.\r
+     */\r
+    private boolean _showConsensusHistogram = true;\r
+\r
+    /**\r
+     * keeps track of state for field: _showConsensusHistogram\r
+     */\r
+    private boolean _has_showConsensusHistogram;\r
+\r
+    /**\r
+     * Field _showConsensusProfile.\r
+     */\r
+    private boolean _showConsensusProfile = false;\r
+\r
+    /**\r
+     * keeps track of state for field: _showConsensusProfile\r
+     */\r
+    private boolean _has_showConsensusProfile;\r
+\r
+    /**\r
+     * Field _ignoreGapsinConsensus.\r
+     */\r
+    private boolean _ignoreGapsinConsensus = true;\r
+\r
+    /**\r
+     * keeps track of state for field: _ignoreGapsinConsensus\r
+     */\r
+    private boolean _has_ignoreGapsinConsensus;\r
+\r
+    /**\r
      * Field _xpos.\r
      */\r
     private int _xpos;\r
@@ -384,6 +484,13 @@ public class Viewport implements java.io.Serializable {
 \r
     /**\r
      */\r
+    public void deleteCentreColumnLabels(\r
+    ) {\r
+        this._has_centreColumnLabels= false;\r
+    }\r
+\r
+    /**\r
+     */\r
     public void deleteConsThreshold(\r
     ) {\r
         this._has_consThreshold= false;\r
@@ -398,6 +505,20 @@ public class Viewport implements java.io.Serializable {
 \r
     /**\r
      */\r
+    public void deleteFollowHighlight(\r
+    ) {\r
+        this._has_followHighlight= false;\r
+    }\r
+\r
+    /**\r
+     */\r
+    public void deleteFollowSelection(\r
+    ) {\r
+        this._has_followSelection= false;\r
+    }\r
+\r
+    /**\r
+     */\r
     public void deleteFontSize(\r
     ) {\r
         this._has_fontSize= false;\r
@@ -426,6 +547,13 @@ public class Viewport implements java.io.Serializable {
 \r
     /**\r
      */\r
+    public void deleteIgnoreGapsinConsensus(\r
+    ) {\r
+        this._has_ignoreGapsinConsensus= false;\r
+    }\r
+\r
+    /**\r
+     */\r
     public void deletePidSelected(\r
     ) {\r
         this._has_pidSelected= false;\r
@@ -475,6 +603,27 @@ public class Viewport implements java.io.Serializable {
 \r
     /**\r
      */\r
+    public void deleteShowConsensusHistogram(\r
+    ) {\r
+        this._has_showConsensusHistogram= false;\r
+    }\r
+\r
+    /**\r
+     */\r
+    public void deleteShowConsensusProfile(\r
+    ) {\r
+        this._has_showConsensusProfile= false;\r
+    }\r
+\r
+    /**\r
+     */\r
+    public void deleteShowDbRefTooltip(\r
+    ) {\r
+        this._has_showDbRefTooltip= false;\r
+    }\r
+\r
+    /**\r
+     */\r
     public void deleteShowFullId(\r
     ) {\r
         this._has_showFullId= false;\r
@@ -482,6 +631,27 @@ public class Viewport implements java.io.Serializable {
 \r
     /**\r
      */\r
+    public void deleteShowGroupConsensus(\r
+    ) {\r
+        this._has_showGroupConsensus= false;\r
+    }\r
+\r
+    /**\r
+     */\r
+    public void deleteShowGroupConservation(\r
+    ) {\r
+        this._has_showGroupConservation= false;\r
+    }\r
+\r
+    /**\r
+     */\r
+    public void deleteShowNPfeatureTooltip(\r
+    ) {\r
+        this._has_showNPfeatureTooltip= false;\r
+    }\r
+\r
+    /**\r
+     */\r
     public void deleteShowSequenceFeatures(\r
     ) {\r
         this._has_showSequenceFeatures= false;\r
@@ -596,6 +766,16 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'centreColumnLabels'.\r
+     * \r
+     * @return the value of field 'CentreColumnLabels'.\r
+     */\r
+    public boolean getCentreColumnLabels(\r
+    ) {\r
+        return this._centreColumnLabels;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'consThreshold'.\r
      * \r
      * @return the value of field 'ConsThreshold'.\r
@@ -616,6 +796,26 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'followHighlight'.\r
+     * \r
+     * @return the value of field 'FollowHighlight'.\r
+     */\r
+    public boolean getFollowHighlight(\r
+    ) {\r
+        return this._followHighlight;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'followSelection'.\r
+     * \r
+     * @return the value of field 'FollowSelection'.\r
+     */\r
+    public boolean getFollowSelection(\r
+    ) {\r
+        return this._followSelection;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'fontName'.\r
      * \r
      * @return the value of field 'FontName'.\r
@@ -726,6 +926,16 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'ignoreGapsinConsensus'.\r
+     * \r
+     * @return the value of field 'IgnoreGapsinConsensus'.\r
+     */\r
+    public boolean getIgnoreGapsinConsensus(\r
+    ) {\r
+        return this._ignoreGapsinConsensus;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'pidSelected'.\r
      * \r
      * @return the value of field 'PidSelected'.\r
@@ -806,6 +1016,36 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'showConsensusHistogram'.\r
+     * \r
+     * @return the value of field 'ShowConsensusHistogram'.\r
+     */\r
+    public boolean getShowConsensusHistogram(\r
+    ) {\r
+        return this._showConsensusHistogram;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'showConsensusProfile'.\r
+     * \r
+     * @return the value of field 'ShowConsensusProfile'.\r
+     */\r
+    public boolean getShowConsensusProfile(\r
+    ) {\r
+        return this._showConsensusProfile;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'showDbRefTooltip'.\r
+     * \r
+     * @return the value of field 'ShowDbRefTooltip'.\r
+     */\r
+    public boolean getShowDbRefTooltip(\r
+    ) {\r
+        return this._showDbRefTooltip;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'showFullId'.\r
      * \r
      * @return the value of field 'ShowFullId'.\r
@@ -816,6 +1056,36 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'showGroupConsensus'.\r
+     * \r
+     * @return the value of field 'ShowGroupConsensus'.\r
+     */\r
+    public boolean getShowGroupConsensus(\r
+    ) {\r
+        return this._showGroupConsensus;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'showGroupConservation'.\r
+     * \r
+     * @return the value of field 'ShowGroupConservation'.\r
+     */\r
+    public boolean getShowGroupConservation(\r
+    ) {\r
+        return this._showGroupConservation;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'showNPfeatureTooltip'.\r
+     * \r
+     * @return the value of field 'ShowNPfeatureTooltip'.\r
+     */\r
+    public boolean getShowNPfeatureTooltip(\r
+    ) {\r
+        return this._showNPfeatureTooltip;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'showSequenceFeatures'.\r
      * \r
      * @return the value of field 'ShowSequenceFeatures'.\r
@@ -956,6 +1226,16 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Method hasCentreColumnLabels.\r
+     * \r
+     * @return true if at least one CentreColumnLabels has been adde\r
+     */\r
+    public boolean hasCentreColumnLabels(\r
+    ) {\r
+        return this._has_centreColumnLabels;\r
+    }\r
+\r
+    /**\r
      * Method hasConsThreshold.\r
      * \r
      * @return true if at least one ConsThreshold has been added\r
@@ -977,6 +1257,26 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Method hasFollowHighlight.\r
+     * \r
+     * @return true if at least one FollowHighlight has been added\r
+     */\r
+    public boolean hasFollowHighlight(\r
+    ) {\r
+        return this._has_followHighlight;\r
+    }\r
+\r
+    /**\r
+     * Method hasFollowSelection.\r
+     * \r
+     * @return true if at least one FollowSelection has been added\r
+     */\r
+    public boolean hasFollowSelection(\r
+    ) {\r
+        return this._has_followSelection;\r
+    }\r
+\r
+    /**\r
      * Method hasFontSize.\r
      * \r
      * @return true if at least one FontSize has been added\r
@@ -1017,6 +1317,17 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Method hasIgnoreGapsinConsensus.\r
+     * \r
+     * @return true if at least one IgnoreGapsinConsensus has been\r
+     * added\r
+     */\r
+    public boolean hasIgnoreGapsinConsensus(\r
+    ) {\r
+        return this._has_ignoreGapsinConsensus;\r
+    }\r
+\r
+    /**\r
      * Method hasPidSelected.\r
      * \r
      * @return true if at least one PidSelected has been added\r
@@ -1087,6 +1398,38 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Method hasShowConsensusHistogram.\r
+     * \r
+     * @return true if at least one ShowConsensusHistogram has been\r
+     * added\r
+     */\r
+    public boolean hasShowConsensusHistogram(\r
+    ) {\r
+        return this._has_showConsensusHistogram;\r
+    }\r
+\r
+    /**\r
+     * Method hasShowConsensusProfile.\r
+     * \r
+     * @return true if at least one ShowConsensusProfile has been\r
+     * added\r
+     */\r
+    public boolean hasShowConsensusProfile(\r
+    ) {\r
+        return this._has_showConsensusProfile;\r
+    }\r
+\r
+    /**\r
+     * Method hasShowDbRefTooltip.\r
+     * \r
+     * @return true if at least one ShowDbRefTooltip has been added\r
+     */\r
+    public boolean hasShowDbRefTooltip(\r
+    ) {\r
+        return this._has_showDbRefTooltip;\r
+    }\r
+\r
+    /**\r
      * Method hasShowFullId.\r
      * \r
      * @return true if at least one ShowFullId has been added\r
@@ -1097,6 +1440,38 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Method hasShowGroupConsensus.\r
+     * \r
+     * @return true if at least one ShowGroupConsensus has been adde\r
+     */\r
+    public boolean hasShowGroupConsensus(\r
+    ) {\r
+        return this._has_showGroupConsensus;\r
+    }\r
+\r
+    /**\r
+     * Method hasShowGroupConservation.\r
+     * \r
+     * @return true if at least one ShowGroupConservation has been\r
+     * added\r
+     */\r
+    public boolean hasShowGroupConservation(\r
+    ) {\r
+        return this._has_showGroupConservation;\r
+    }\r
+\r
+    /**\r
+     * Method hasShowNPfeatureTooltip.\r
+     * \r
+     * @return true if at least one ShowNPfeatureTooltip has been\r
+     * added\r
+     */\r
+    public boolean hasShowNPfeatureTooltip(\r
+    ) {\r
+        return this._has_showNPfeatureTooltip;\r
+    }\r
+\r
+    /**\r
      * Method hasShowSequenceFeatures.\r
      * \r
      * @return true if at least one ShowSequenceFeatures has been\r
@@ -1218,6 +1593,16 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'centreColumnLabels'.\r
+     * \r
+     * @return the value of field 'CentreColumnLabels'.\r
+     */\r
+    public boolean isCentreColumnLabels(\r
+    ) {\r
+        return this._centreColumnLabels;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'conservationSelected'.\r
      * \r
      * @return the value of field 'ConservationSelected'.\r
@@ -1228,6 +1613,26 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'followHighlight'.\r
+     * \r
+     * @return the value of field 'FollowHighlight'.\r
+     */\r
+    public boolean isFollowHighlight(\r
+    ) {\r
+        return this._followHighlight;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'followSelection'.\r
+     * \r
+     * @return the value of field 'FollowSelection'.\r
+     */\r
+    public boolean isFollowSelection(\r
+    ) {\r
+        return this._followSelection;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'gatheredViews'.\r
      * \r
      * @return the value of field 'GatheredViews'.\r
@@ -1238,6 +1643,16 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'ignoreGapsinConsensus'.\r
+     * \r
+     * @return the value of field 'IgnoreGapsinConsensus'.\r
+     */\r
+    public boolean isIgnoreGapsinConsensus(\r
+    ) {\r
+        return this._ignoreGapsinConsensus;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'pidSelected'.\r
      * \r
      * @return the value of field 'PidSelected'.\r
@@ -1298,6 +1713,36 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'showConsensusHistogram'.\r
+     * \r
+     * @return the value of field 'ShowConsensusHistogram'.\r
+     */\r
+    public boolean isShowConsensusHistogram(\r
+    ) {\r
+        return this._showConsensusHistogram;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'showConsensusProfile'.\r
+     * \r
+     * @return the value of field 'ShowConsensusProfile'.\r
+     */\r
+    public boolean isShowConsensusProfile(\r
+    ) {\r
+        return this._showConsensusProfile;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'showDbRefTooltip'.\r
+     * \r
+     * @return the value of field 'ShowDbRefTooltip'.\r
+     */\r
+    public boolean isShowDbRefTooltip(\r
+    ) {\r
+        return this._showDbRefTooltip;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'showFullId'.\r
      * \r
      * @return the value of field 'ShowFullId'.\r
@@ -1308,6 +1753,36 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Returns the value of field 'showGroupConsensus'.\r
+     * \r
+     * @return the value of field 'ShowGroupConsensus'.\r
+     */\r
+    public boolean isShowGroupConsensus(\r
+    ) {\r
+        return this._showGroupConsensus;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'showGroupConservation'.\r
+     * \r
+     * @return the value of field 'ShowGroupConservation'.\r
+     */\r
+    public boolean isShowGroupConservation(\r
+    ) {\r
+        return this._showGroupConservation;\r
+    }\r
+\r
+    /**\r
+     * Returns the value of field 'showNPfeatureTooltip'.\r
+     * \r
+     * @return the value of field 'ShowNPfeatureTooltip'.\r
+     */\r
+    public boolean isShowNPfeatureTooltip(\r
+    ) {\r
+        return this._showNPfeatureTooltip;\r
+    }\r
+\r
+    /**\r
      * Returns the value of field 'showSequenceFeatures'.\r
      * \r
      * @return the value of field 'ShowSequenceFeatures'.\r
@@ -1447,6 +1922,18 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Sets the value of field 'centreColumnLabels'.\r
+     * \r
+     * @param centreColumnLabels the value of field\r
+     * 'centreColumnLabels'.\r
+     */\r
+    public void setCentreColumnLabels(\r
+            final boolean centreColumnLabels) {\r
+        this._centreColumnLabels = centreColumnLabels;\r
+        this._has_centreColumnLabels = true;\r
+    }\r
+\r
+    /**\r
      * Sets the value of field 'consThreshold'.\r
      * \r
      * @param consThreshold the value of field 'consThreshold'.\r
@@ -1470,6 +1957,28 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Sets the value of field 'followHighlight'.\r
+     * \r
+     * @param followHighlight the value of field 'followHighlight'.\r
+     */\r
+    public void setFollowHighlight(\r
+            final boolean followHighlight) {\r
+        this._followHighlight = followHighlight;\r
+        this._has_followHighlight = true;\r
+    }\r
+\r
+    /**\r
+     * Sets the value of field 'followSelection'.\r
+     * \r
+     * @param followSelection the value of field 'followSelection'.\r
+     */\r
+    public void setFollowSelection(\r
+            final boolean followSelection) {\r
+        this._followSelection = followSelection;\r
+        this._has_followSelection = true;\r
+    }\r
+\r
+    /**\r
      * Sets the value of field 'fontName'.\r
      * \r
      * @param fontName the value of field 'fontName'.\r
@@ -1572,6 +2081,18 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Sets the value of field 'ignoreGapsinConsensus'.\r
+     * \r
+     * @param ignoreGapsinConsensus the value of field\r
+     * 'ignoreGapsinConsensus'.\r
+     */\r
+    public void setIgnoreGapsinConsensus(\r
+            final boolean ignoreGapsinConsensus) {\r
+        this._ignoreGapsinConsensus = ignoreGapsinConsensus;\r
+        this._has_ignoreGapsinConsensus = true;\r
+    }\r
+\r
+    /**\r
      * Sets the value of field 'pidSelected'.\r
      * \r
      * @param pidSelected the value of field 'pidSelected'.\r
@@ -1659,6 +2180,41 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Sets the value of field 'showConsensusHistogram'.\r
+     * \r
+     * @param showConsensusHistogram the value of field\r
+     * 'showConsensusHistogram'.\r
+     */\r
+    public void setShowConsensusHistogram(\r
+            final boolean showConsensusHistogram) {\r
+        this._showConsensusHistogram = showConsensusHistogram;\r
+        this._has_showConsensusHistogram = true;\r
+    }\r
+\r
+    /**\r
+     * Sets the value of field 'showConsensusProfile'.\r
+     * \r
+     * @param showConsensusProfile the value of field\r
+     * 'showConsensusProfile'.\r
+     */\r
+    public void setShowConsensusProfile(\r
+            final boolean showConsensusProfile) {\r
+        this._showConsensusProfile = showConsensusProfile;\r
+        this._has_showConsensusProfile = true;\r
+    }\r
+\r
+    /**\r
+     * Sets the value of field 'showDbRefTooltip'.\r
+     * \r
+     * @param showDbRefTooltip the value of field 'showDbRefTooltip'\r
+     */\r
+    public void setShowDbRefTooltip(\r
+            final boolean showDbRefTooltip) {\r
+        this._showDbRefTooltip = showDbRefTooltip;\r
+        this._has_showDbRefTooltip = true;\r
+    }\r
+\r
+    /**\r
      * Sets the value of field 'showFullId'.\r
      * \r
      * @param showFullId the value of field 'showFullId'.\r
@@ -1670,6 +2226,42 @@ public class Viewport implements java.io.Serializable {
     }\r
 \r
     /**\r
+     * Sets the value of field 'showGroupConsensus'.\r
+     * \r
+     * @param showGroupConsensus the value of field\r
+     * 'showGroupConsensus'.\r
+     */\r
+    public void setShowGroupConsensus(\r
+            final boolean showGroupConsensus) {\r
+        this._showGroupConsensus = showGroupConsensus;\r
+        this._has_showGroupConsensus = true;\r
+    }\r
+\r
+    /**\r
+     * Sets the value of field 'showGroupConservation'.\r
+     * \r
+     * @param showGroupConservation the value of field\r
+     * 'showGroupConservation'.\r
+     */\r
+    public void setShowGroupConservation(\r
+            final boolean showGroupConservation) {\r
+        this._showGroupConservation = showGroupConservation;\r
+        this._has_showGroupConservation = true;\r
+    }\r
+\r
+    /**\r
+     * Sets the value of field 'showNPfeatureTooltip'.\r
+     * \r
+     * @param showNPfeatureTooltip the value of field\r
+     * 'showNPfeatureTooltip'.\r
+     */\r
+    public void setShowNPfeatureTooltip(\r
+            final boolean showNPfeatureTooltip) {\r
+        this._showNPfeatureTooltip = showNPfeatureTooltip;\r
+        this._has_showNPfeatureTooltip = true;\r
+    }\r
+\r
+    /**\r
      * Sets the value of field 'showSequenceFeatures'.\r
      * \r
      * @param showSequenceFeatures the value of field\r
index cdbfceb..f2c6fcf 100644 (file)
@@ -195,6 +195,43 @@ public class AnnotationDescriptor extends org.exolab.castor.xml.util.XMLClassDes
             typeValidator.setWhiteSpace("preserve");\r
         }\r
         desc.setValidator(fieldValidator);\r
+        //-- _groupRef\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_groupRef", "groupRef", org.exolab.castor.xml.NodeType.Attribute);\r
+        desc.setImmutable(true);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Annotation target = (Annotation) object;\r
+                return target.getGroupRef();\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Annotation target = (Annotation) object;\r
+                    target.setGroupRef( (java.lang.String) value);\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _groupRef\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.StringValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.StringValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+            typeValidator.setWhiteSpace("preserve");\r
+        }\r
+        desc.setValidator(fieldValidator);\r
         //-- _graphColour\r
         desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_graphColour", "graphColour", org.exolab.castor.xml.NodeType.Attribute);\r
         handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
@@ -443,6 +480,170 @@ public class AnnotationDescriptor extends org.exolab.castor.xml.util.XMLClassDes
             fieldValidator.setValidator(typeValidator);\r
         }\r
         desc.setValidator(fieldValidator);\r
+        //-- _centreColLabels\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_centreColLabels", "centreColLabels", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Annotation target = (Annotation) object;\r
+                if (!target.hasCentreColLabels()) { return null; }\r
+                return (target.getCentreColLabels() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Annotation target = (Annotation) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteCentreColLabels();\r
+                        return;\r
+                    }\r
+                    target.setCentreColLabels( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _centreColLabels\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _scaleColLabels\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_scaleColLabels", "scaleColLabels", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Annotation target = (Annotation) object;\r
+                if (!target.hasScaleColLabels()) { return null; }\r
+                return (target.getScaleColLabels() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Annotation target = (Annotation) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteScaleColLabels();\r
+                        return;\r
+                    }\r
+                    target.setScaleColLabels( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _scaleColLabels\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _showAllColLabels\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showAllColLabels", "showAllColLabels", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Annotation target = (Annotation) object;\r
+                if (!target.hasShowAllColLabels()) { return null; }\r
+                return (target.getShowAllColLabels() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Annotation target = (Annotation) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteShowAllColLabels();\r
+                        return;\r
+                    }\r
+                    target.setShowAllColLabels( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _showAllColLabels\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _autoCalculated\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_autoCalculated", "autoCalculated", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Annotation target = (Annotation) object;\r
+                if (!target.hasAutoCalculated()) { return null; }\r
+                return (target.getAutoCalculated() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Annotation target = (Annotation) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteAutoCalculated();\r
+                        return;\r
+                    }\r
+                    target.setAutoCalculated( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _autoCalculated\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
         //-- initialize element descriptors\r
         \r
         //-- _annotationElementList\r
index da2d048..2cc969b 100644 (file)
@@ -656,6 +656,166 @@ public class JGroupDescriptor extends org.exolab.castor.xml.util.XMLClassDescrip
             fieldValidator.setValidator(typeValidator);\r
         }\r
         desc.setValidator(fieldValidator);\r
+        //-- _ignoreGapsinConsensus\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_ignoreGapsinConsensus", "ignoreGapsinConsensus", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                JGroup target = (JGroup) object;\r
+                if (!target.hasIgnoreGapsinConsensus()) { return null; }\r
+                return (target.getIgnoreGapsinConsensus() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    JGroup target = (JGroup) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteIgnoreGapsinConsensus();\r
+                        return;\r
+                    }\r
+                    target.setIgnoreGapsinConsensus( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _ignoreGapsinConsensus\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _showConsensusHistogram\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showConsensusHistogram", "showConsensusHistogram", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                JGroup target = (JGroup) object;\r
+                if (!target.hasShowConsensusHistogram()) { return null; }\r
+                return (target.getShowConsensusHistogram() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    JGroup target = (JGroup) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteShowConsensusHistogram();\r
+                        return;\r
+                    }\r
+                    target.setShowConsensusHistogram( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _showConsensusHistogram\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _showConsensusProfile\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showConsensusProfile", "showConsensusProfile", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                JGroup target = (JGroup) object;\r
+                if (!target.hasShowConsensusProfile()) { return null; }\r
+                return (target.getShowConsensusProfile() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    JGroup target = (JGroup) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteShowConsensusProfile();\r
+                        return;\r
+                    }\r
+                    target.setShowConsensusProfile( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _showConsensusProfile\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _id\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_id", "id", org.exolab.castor.xml.NodeType.Attribute);\r
+        desc.setImmutable(true);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                JGroup target = (JGroup) object;\r
+                return target.getId();\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    JGroup target = (JGroup) object;\r
+                    target.setId( (java.lang.String) value);\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _id\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.StringValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.StringValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+            typeValidator.setWhiteSpace("preserve");\r
+        }\r
+        desc.setValidator(fieldValidator);\r
         //-- initialize element descriptors\r
         \r
         //-- _seqList\r
index 6909f5c..889bd07 100644 (file)
@@ -366,6 +366,174 @@ public class SettingDescriptor extends org.exolab.castor.xml.util.XMLClassDescri
             typeValidator.setMaxInclusive(2147483647);\r
         }\r
         desc.setValidator(fieldValidator);\r
+        //-- _max\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Float.TYPE, "_max", "max", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Setting target = (Setting) object;\r
+                if (!target.hasMax()) { return null; }\r
+                return new java.lang.Float(target.getMax());\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Setting target = (Setting) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteMax();\r
+                        return;\r
+                    }\r
+                    target.setMax( ((java.lang.Float) value).floatValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _max\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.FloatValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.FloatValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+            typeValidator.setMinInclusive((float) -3.4028235E38);\r
+            typeValidator.setMaxInclusive((float) 3.4028235E38);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _min\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Float.TYPE, "_min", "min", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Setting target = (Setting) object;\r
+                if (!target.hasMin()) { return null; }\r
+                return new java.lang.Float(target.getMin());\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Setting target = (Setting) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteMin();\r
+                        return;\r
+                    }\r
+                    target.setMin( ((java.lang.Float) value).floatValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _min\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.FloatValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.FloatValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+            typeValidator.setMinInclusive((float) -3.4028235E38);\r
+            typeValidator.setMaxInclusive((float) 3.4028235E38);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _colourByLabel\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_colourByLabel", "colourByLabel", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Setting target = (Setting) object;\r
+                if (!target.hasColourByLabel()) { return null; }\r
+                return (target.getColourByLabel() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Setting target = (Setting) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteColourByLabel();\r
+                        return;\r
+                    }\r
+                    target.setColourByLabel( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _colourByLabel\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _autoScale\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_autoScale", "autoScale", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Setting target = (Setting) object;\r
+                if (!target.hasAutoScale()) { return null; }\r
+                return (target.getAutoScale() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Setting target = (Setting) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteAutoScale();\r
+                        return;\r
+                    }\r
+                    target.setAutoScale( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _autoScale\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
         //-- initialize element descriptors\r
         \r
     }\r
index 507cd93..cad1109 100644 (file)
@@ -685,6 +685,170 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
             fieldValidator.setValidator(typeValidator);\r
         }\r
         desc.setValidator(fieldValidator);\r
+        //-- _showNPfeatureTooltip\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showNPfeatureTooltip", "showNPfeatureTooltip", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Viewport target = (Viewport) object;\r
+                if (!target.hasShowNPfeatureTooltip()) { return null; }\r
+                return (target.getShowNPfeatureTooltip() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Viewport target = (Viewport) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteShowNPfeatureTooltip();\r
+                        return;\r
+                    }\r
+                    target.setShowNPfeatureTooltip( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _showNPfeatureTooltip\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _showDbRefTooltip\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showDbRefTooltip", "showDbRefTooltip", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Viewport target = (Viewport) object;\r
+                if (!target.hasShowDbRefTooltip()) { return null; }\r
+                return (target.getShowDbRefTooltip() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Viewport target = (Viewport) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteShowDbRefTooltip();\r
+                        return;\r
+                    }\r
+                    target.setShowDbRefTooltip( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _showDbRefTooltip\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _followHighlight\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_followHighlight", "followHighlight", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Viewport target = (Viewport) object;\r
+                if (!target.hasFollowHighlight()) { return null; }\r
+                return (target.getFollowHighlight() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Viewport target = (Viewport) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteFollowHighlight();\r
+                        return;\r
+                    }\r
+                    target.setFollowHighlight( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _followHighlight\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _followSelection\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_followSelection", "followSelection", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Viewport target = (Viewport) object;\r
+                if (!target.hasFollowSelection()) { return null; }\r
+                return (target.getFollowSelection() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Viewport target = (Viewport) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteFollowSelection();\r
+                        return;\r
+                    }\r
+                    target.setFollowSelection( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _followSelection\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
         //-- _showAnnotation\r
         desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showAnnotation", "showAnnotation", org.exolab.castor.xml.NodeType.Attribute);\r
         handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
@@ -726,6 +890,252 @@ public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescr
             fieldValidator.setValidator(typeValidator);\r
         }\r
         desc.setValidator(fieldValidator);\r
+        //-- _centreColumnLabels\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_centreColumnLabels", "centreColumnLabels", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Viewport target = (Viewport) object;\r
+                if (!target.hasCentreColumnLabels()) { return null; }\r
+                return (target.getCentreColumnLabels() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Viewport target = (Viewport) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteCentreColumnLabels();\r
+                        return;\r
+                    }\r
+                    target.setCentreColumnLabels( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _centreColumnLabels\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _showGroupConservation\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showGroupConservation", "showGroupConservation", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Viewport target = (Viewport) object;\r
+                if (!target.hasShowGroupConservation()) { return null; }\r
+                return (target.getShowGroupConservation() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Viewport target = (Viewport) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteShowGroupConservation();\r
+                        return;\r
+                    }\r
+                    target.setShowGroupConservation( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _showGroupConservation\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _showGroupConsensus\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showGroupConsensus", "showGroupConsensus", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Viewport target = (Viewport) object;\r
+                if (!target.hasShowGroupConsensus()) { return null; }\r
+                return (target.getShowGroupConsensus() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Viewport target = (Viewport) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteShowGroupConsensus();\r
+                        return;\r
+                    }\r
+                    target.setShowGroupConsensus( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _showGroupConsensus\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _showConsensusHistogram\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showConsensusHistogram", "showConsensusHistogram", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Viewport target = (Viewport) object;\r
+                if (!target.hasShowConsensusHistogram()) { return null; }\r
+                return (target.getShowConsensusHistogram() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Viewport target = (Viewport) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteShowConsensusHistogram();\r
+                        return;\r
+                    }\r
+                    target.setShowConsensusHistogram( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _showConsensusHistogram\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _showConsensusProfile\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showConsensusProfile", "showConsensusProfile", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Viewport target = (Viewport) object;\r
+                if (!target.hasShowConsensusProfile()) { return null; }\r
+                return (target.getShowConsensusProfile() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Viewport target = (Viewport) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteShowConsensusProfile();\r
+                        return;\r
+                    }\r
+                    target.setShowConsensusProfile( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _showConsensusProfile\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
+        //-- _ignoreGapsinConsensus\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_ignoreGapsinConsensus", "ignoreGapsinConsensus", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Viewport target = (Viewport) object;\r
+                if (!target.hasIgnoreGapsinConsensus()) { return null; }\r
+                return (target.getIgnoreGapsinConsensus() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Viewport target = (Viewport) object;\r
+                    // if null, use delete method for optional primitives \r
+                    if (value == null) {\r
+                        target.deleteIgnoreGapsinConsensus();\r
+                        return;\r
+                    }\r
+                    target.setIgnoreGapsinConsensus( ((java.lang.Boolean) value).booleanValue());\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return null;\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setMultivalued(false);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _ignoreGapsinConsensus\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            org.exolab.castor.xml.validators.BooleanValidator typeValidator;\r
+            typeValidator = new org.exolab.castor.xml.validators.BooleanValidator();\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
         //-- _xpos\r
         desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_xpos", "xpos", org.exolab.castor.xml.NodeType.Attribute);\r
         handler = new org.exolab.castor.xml.XMLFieldHandler() {\r