castor-1.1 classes (descriptors moved to subpackage)
authorjprocter <Jim Procter>
Thu, 24 May 2007 15:20:45 +0000 (15:20 +0000)
committerjprocter <Jim Procter>
Thu, 24 May 2007 15:20:45 +0000 (15:20 +0000)
34 files changed:
src/jalview/schemabinding/version2/.castor.cdr
src/jalview/schemabinding/version2/AnnotationColoursDescriptor.java [deleted file]
src/jalview/schemabinding/version2/AnnotationDescriptor.java [deleted file]
src/jalview/schemabinding/version2/AnnotationElementDescriptor.java [deleted file]
src/jalview/schemabinding/version2/ColourDescriptor.java [deleted file]
src/jalview/schemabinding/version2/DBRefDescriptor.java [deleted file]
src/jalview/schemabinding/version2/FeatureDescriptor.java [deleted file]
src/jalview/schemabinding/version2/FeatureSettingsDescriptor.java [deleted file]
src/jalview/schemabinding/version2/FeaturesDescriptor.java [deleted file]
src/jalview/schemabinding/version2/GroupDescriptor.java [deleted file]
src/jalview/schemabinding/version2/HiddenColumnsDescriptor.java [deleted file]
src/jalview/schemabinding/version2/JGroupDescriptor.java [deleted file]
src/jalview/schemabinding/version2/JSeqDescriptor.java [deleted file]
src/jalview/schemabinding/version2/JalviewModelDescriptor.java [deleted file]
src/jalview/schemabinding/version2/JalviewModelSequenceDescriptor.java [deleted file]
src/jalview/schemabinding/version2/JalviewUserColoursDescriptor.java [deleted file]
src/jalview/schemabinding/version2/OtherDataDescriptor.java [deleted file]
src/jalview/schemabinding/version2/PdbentryDescriptor.java [deleted file]
src/jalview/schemabinding/version2/PdbentryItemDescriptor.java [deleted file]
src/jalview/schemabinding/version2/PdbidsDescriptor.java [deleted file]
src/jalview/schemabinding/version2/PropertyDescriptor.java [deleted file]
src/jalview/schemabinding/version2/SequenceDescriptor.java [deleted file]
src/jalview/schemabinding/version2/SequenceSetDescriptor.java [deleted file]
src/jalview/schemabinding/version2/SequenceSetPropertiesDescriptor.java [deleted file]
src/jalview/schemabinding/version2/SequenceTypeDescriptor.java [deleted file]
src/jalview/schemabinding/version2/SettingDescriptor.java [deleted file]
src/jalview/schemabinding/version2/StructureStateDescriptor.java [deleted file]
src/jalview/schemabinding/version2/ThresholdLineDescriptor.java [deleted file]
src/jalview/schemabinding/version2/TreeDescriptor.java [deleted file]
src/jalview/schemabinding/version2/UserColourSchemeDescriptor.java [deleted file]
src/jalview/schemabinding/version2/UserColoursDescriptor.java [deleted file]
src/jalview/schemabinding/version2/VAMSASDescriptor.java [deleted file]
src/jalview/schemabinding/version2/VamsasModelDescriptor.java [deleted file]
src/jalview/schemabinding/version2/ViewportDescriptor.java [deleted file]

index f617206..24ffdfa 100644 (file)
@@ -1,4 +1,4 @@
-#Tue May 15 19:58:04 BST 2007\r
+#Thu May 24 16:17:26 BST 2007\r
 jalview.schemabinding.version2.AnnotationColours=jalview.schemabinding.version2.descriptors.AnnotationColoursDescriptor\r
 jalview.schemabinding.version2.Sequence=jalview.schemabinding.version2.descriptors.SequenceDescriptor\r
 jalview.schemabinding.version2.SequenceType=jalview.schemabinding.version2.descriptors.SequenceTypeDescriptor\r
@@ -15,18 +15,18 @@ jalview.schemabinding.version2.JalviewModelSequence=jalview.schemabinding.versio
 jalview.schemabinding.version2.Features=jalview.schemabinding.version2.descriptors.FeaturesDescriptor\r
 jalview.schemabinding.version2.SequenceSet=jalview.schemabinding.version2.descriptors.SequenceSetDescriptor\r
 jalview.schemabinding.version2.DBRef=jalview.schemabinding.version2.descriptors.DBRefDescriptor\r
-jalview.schemabinding.version2.Colour=jalview.schemabinding.version2.descriptors.ColourDescriptor\r
 jalview.schemabinding.version2.Feature=jalview.schemabinding.version2.descriptors.FeatureDescriptor\r
+jalview.schemabinding.version2.Colour=jalview.schemabinding.version2.descriptors.ColourDescriptor\r
 jalview.schemabinding.version2.Viewport=jalview.schemabinding.version2.descriptors.ViewportDescriptor\r
-jalview.schemabinding.version2.JalviewModel=jalview.schemabinding.version2.descriptors.JalviewModelDescriptor\r
 jalview.schemabinding.version2.JGroup=jalview.schemabinding.version2.descriptors.JGroupDescriptor\r
+jalview.schemabinding.version2.JalviewModel=jalview.schemabinding.version2.descriptors.JalviewModelDescriptor\r
 jalview.schemabinding.version2.FeatureSettings=jalview.schemabinding.version2.descriptors.FeatureSettingsDescriptor\r
 jalview.schemabinding.version2.UserColourScheme=jalview.schemabinding.version2.descriptors.UserColourSchemeDescriptor\r
-jalview.schemabinding.version2.Pdbids=jalview.schemabinding.version2.descriptors.PdbidsDescriptor\r
-jalview.schemabinding.version2.HiddenColumns=jalview.schemabinding.version2.descriptors.HiddenColumnsDescriptor\r
 jalview.schemabinding.version2.Group=jalview.schemabinding.version2.descriptors.GroupDescriptor\r
-jalview.schemabinding.version2.Tree=jalview.schemabinding.version2.descriptors.TreeDescriptor\r
+jalview.schemabinding.version2.HiddenColumns=jalview.schemabinding.version2.descriptors.HiddenColumnsDescriptor\r
+jalview.schemabinding.version2.Pdbids=jalview.schemabinding.version2.descriptors.PdbidsDescriptor\r
 jalview.schemabinding.version2.Setting=jalview.schemabinding.version2.descriptors.SettingDescriptor\r
+jalview.schemabinding.version2.Tree=jalview.schemabinding.version2.descriptors.TreeDescriptor\r
 jalview.schemabinding.version2.UserColours=jalview.schemabinding.version2.descriptors.UserColoursDescriptor\r
 jalview.schemabinding.version2.JSeq=jalview.schemabinding.version2.descriptors.JSeqDescriptor\r
 jalview.schemabinding.version2.SequenceSetProperties=jalview.schemabinding.version2.descriptors.SequenceSetPropertiesDescriptor\r
diff --git a/src/jalview/schemabinding/version2/AnnotationColoursDescriptor.java b/src/jalview/schemabinding/version2/AnnotationColoursDescriptor.java
deleted file mode 100755 (executable)
index c3c06e6..0000000
+++ /dev/null
@@ -1,406 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class AnnotationColoursDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class AnnotationColoursDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public AnnotationColoursDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "AnnotationColours";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _aboveThreshold\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_aboveThreshold", "aboveThreshold", 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
-                AnnotationColours target = (AnnotationColours) object;\r
-                if(!target.hasAboveThreshold())\r
-                    return null;\r
-                return new java.lang.Integer(target.getAboveThreshold());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AnnotationColours target = (AnnotationColours) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteAboveThreshold();\r
-                        return;\r
-                    }\r
-                    target.setAboveThreshold( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _aboveThreshold\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _annotation\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_annotation", "annotation", 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
-                AnnotationColours target = (AnnotationColours) object;\r
-                return target.getAnnotation();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AnnotationColours target = (AnnotationColours) object;\r
-                    target.setAnnotation( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _annotation\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _minColour\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_minColour", "minColour", 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
-                AnnotationColours target = (AnnotationColours) object;\r
-                if(!target.hasMinColour())\r
-                    return null;\r
-                return new java.lang.Integer(target.getMinColour());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AnnotationColours target = (AnnotationColours) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteMinColour();\r
-                        return;\r
-                    }\r
-                    target.setMinColour( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _minColour\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _maxColour\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_maxColour", "maxColour", 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
-                AnnotationColours target = (AnnotationColours) object;\r
-                if(!target.hasMaxColour())\r
-                    return null;\r
-                return new java.lang.Integer(target.getMaxColour());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AnnotationColours target = (AnnotationColours) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteMaxColour();\r
-                        return;\r
-                    }\r
-                    target.setMaxColour( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _maxColour\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _colourScheme\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_colourScheme", "colourScheme", 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
-                AnnotationColours target = (AnnotationColours) object;\r
-                return target.getColourScheme();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AnnotationColours target = (AnnotationColours) object;\r
-                    target.setColourScheme( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _colourScheme\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _threshold\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(float.class, "_threshold", "threshold", 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
-                AnnotationColours target = (AnnotationColours) object;\r
-                if(!target.hasThreshold())\r
-                    return null;\r
-                return new java.lang.Float(target.getThreshold());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AnnotationColours target = (AnnotationColours) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteThreshold();\r
-                        return;\r
-                    }\r
-                    target.setThreshold( ((java.lang.Float)value).floatValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _threshold\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            FloatValidator typeValidator = new FloatValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-    } //-- jalview.schemabinding.version2.AnnotationColoursDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.AnnotationColours.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/AnnotationDescriptor.java b/src/jalview/schemabinding/version2/AnnotationDescriptor.java
deleted file mode 100755 (executable)
index e0380f3..0000000
+++ /dev/null
@@ -1,679 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class AnnotationDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class AnnotationDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public AnnotationDescriptor() {\r
-        super();\r
-        nsURI = "www.vamsas.ac.uk/jalview/version2";\r
-        xmlName = "Annotation";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _graph\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_graph", "graph", 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.hasGraph())\r
-                    return null;\r
-                return (target.getGraph() ? 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
-                    // ignore null values for non optional primitives\r
-                    if (value == null) return;\r
-                    \r
-                    target.setGraph( ((java.lang.Boolean)value).booleanValue());\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _graph\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _graphType\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_graphType", "graphType", 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.hasGraphType())\r
-                    return null;\r
-                return new java.lang.Integer(target.getGraphType());\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.deleteGraphType();\r
-                        return;\r
-                    }\r
-                    target.setGraphType( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _graphType\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _sequenceRef\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_sequenceRef", "sequenceRef", 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.getSequenceRef();\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.setSequenceRef( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _sequenceRef\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\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
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                Annotation target = (Annotation) object;\r
-                if(!target.hasGraphColour())\r
-                    return null;\r
-                return new java.lang.Integer(target.getGraphColour());\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.deleteGraphColour();\r
-                        return;\r
-                    }\r
-                    target.setGraphColour( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _graphColour\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _graphGroup\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_graphGroup", "graphGroup", 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.hasGraphGroup())\r
-                    return null;\r
-                return new java.lang.Integer(target.getGraphGroup());\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.deleteGraphGroup();\r
-                        return;\r
-                    }\r
-                    target.setGraphGroup( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _graphGroup\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\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
-                Annotation target = (Annotation) 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
-                    Annotation target = (Annotation) object;\r
-                    target.setId( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _id\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _scoreOnly\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_scoreOnly", "scoreOnly", 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.hasScoreOnly())\r
-                    return null;\r
-                return (target.getScoreOnly() ? 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.deleteScoreOnly();\r
-                        return;\r
-                    }\r
-                    target.setScoreOnly( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _scoreOnly\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _score\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Double.TYPE, "_score", "score", 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.hasScore())\r
-                    return null;\r
-                return new java.lang.Double(target.getScore());\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.deleteScore();\r
-                        return;\r
-                    }\r
-                    target.setScore( ((java.lang.Double)value).doubleValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _score\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            DoubleValidator typeValidator = new DoubleValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _visible\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_visible", "visible", 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.hasVisible())\r
-                    return null;\r
-                return (target.getVisible() ? 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.deleteVisible();\r
-                        return;\r
-                    }\r
-                    target.setVisible( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _visible\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-        //-- _annotationElementList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.AnnotationElement.class, "_annotationElementList", "annotationElement", org.exolab.castor.xml.NodeType.Element);\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.getAnnotationElement();\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.addAnnotationElement( (jalview.schemabinding.version2.AnnotationElement) value);\r
-                }\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 new jalview.schemabinding.version2.AnnotationElement();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _annotationElementList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _label\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_label", "label", org.exolab.castor.xml.NodeType.Element);\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.getLabel();\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.setLabel( (java.lang.String) value);\r
-                }\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.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _label\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _description\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_description", "description", org.exolab.castor.xml.NodeType.Element);\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.getDescription();\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.setDescription( (java.lang.String) value);\r
-                }\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.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _description\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _thresholdLine\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.ThresholdLine.class, "_thresholdLine", "thresholdLine", org.exolab.castor.xml.NodeType.Element);\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.getThresholdLine();\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.setThresholdLine( (jalview.schemabinding.version2.ThresholdLine) value);\r
-                }\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 new jalview.schemabinding.version2.ThresholdLine();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _thresholdLine\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.AnnotationDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.Annotation.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/AnnotationElementDescriptor.java b/src/jalview/schemabinding/version2/AnnotationElementDescriptor.java
deleted file mode 100755 (executable)
index 0eab95b..0000000
+++ /dev/null
@@ -1,413 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class AnnotationElementDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class AnnotationElementDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public AnnotationElementDescriptor() {\r
-        super();\r
-        nsURI = "www.vamsas.ac.uk/jalview/version2";\r
-        xmlName = "annotationElement";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _position\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_position", "position", 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
-                AnnotationElement target = (AnnotationElement) object;\r
-                if(!target.hasPosition())\r
-                    return null;\r
-                return new java.lang.Integer(target.getPosition());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AnnotationElement target = (AnnotationElement) object;\r
-                    // ignore null values for non optional primitives\r
-                    if (value == null) return;\r
-                    \r
-                    target.setPosition( ((java.lang.Integer)value).intValue());\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _position\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _colour\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_colour", "colour", 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
-                AnnotationElement target = (AnnotationElement) object;\r
-                if(!target.hasColour())\r
-                    return null;\r
-                return new java.lang.Integer(target.getColour());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AnnotationElement target = (AnnotationElement) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteColour();\r
-                        return;\r
-                    }\r
-                    target.setColour( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _colour\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-        //-- _displayCharacter\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_displayCharacter", "displayCharacter", org.exolab.castor.xml.NodeType.Element);\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
-                AnnotationElement target = (AnnotationElement) object;\r
-                return target.getDisplayCharacter();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AnnotationElement target = (AnnotationElement) object;\r
-                    target.setDisplayCharacter( (java.lang.String) value);\r
-                }\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.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _displayCharacter\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _description\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_description", "description", org.exolab.castor.xml.NodeType.Element);\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
-                AnnotationElement target = (AnnotationElement) object;\r
-                return target.getDescription();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AnnotationElement target = (AnnotationElement) object;\r
-                    target.setDescription( (java.lang.String) value);\r
-                }\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.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _description\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _secondaryStructure\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_secondaryStructure", "secondaryStructure", org.exolab.castor.xml.NodeType.Element);\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
-                AnnotationElement target = (AnnotationElement) object;\r
-                return target.getSecondaryStructure();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AnnotationElement target = (AnnotationElement) object;\r
-                    target.setSecondaryStructure( (java.lang.String) value);\r
-                }\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.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _secondaryStructure\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setLength(1);\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _value\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(float.class, "_value", "value", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                AnnotationElement target = (AnnotationElement) object;\r
-                if(!target.hasValue())\r
-                    return null;\r
-                return new java.lang.Float(target.getValue());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AnnotationElement target = (AnnotationElement) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteValue();\r
-                        return;\r
-                    }\r
-                    target.setValue( ((java.lang.Float)value).floatValue());\r
-                }\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.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _value\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            FloatValidator typeValidator = new FloatValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.AnnotationElementDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.AnnotationElement.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/ColourDescriptor.java b/src/jalview/schemabinding/version2/ColourDescriptor.java
deleted file mode 100755 (executable)
index 7aa3a82..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class ColourDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class ColourDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public ColourDescriptor() {\r
-        super();\r
-        xmlName = "colour";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _name\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "Name", 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
-                Colour target = (Colour) object;\r
-                return target.getName();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Colour target = (Colour) object;\r
-                    target.setName( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _name\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _RGB\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_RGB", "RGB", 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
-                Colour target = (Colour) object;\r
-                return target.getRGB();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Colour target = (Colour) object;\r
-                    target.setRGB( (java.lang.String) value);\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _RGB\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-    } //-- jalview.schemabinding.version2.ColourDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.Colour.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/DBRefDescriptor.java b/src/jalview/schemabinding/version2/DBRefDescriptor.java
deleted file mode 100644 (file)
index 939d5b1..0000000
+++ /dev/null
@@ -1,278 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class DBRefDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class DBRefDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public DBRefDescriptor() {\r
-        super();\r
-        nsURI = "www.vamsas.ac.uk/jalview/version2";\r
-        xmlName = "DBRef";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _source\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_source", "source", 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
-                DBRef target = (DBRef) object;\r
-                return target.getSource();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    DBRef target = (DBRef) object;\r
-                    target.setSource( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _source\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _version\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_version", "version", 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
-                DBRef target = (DBRef) object;\r
-                return target.getVersion();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    DBRef target = (DBRef) object;\r
-                    target.setVersion( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _version\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _accessionId\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_accessionId", "accessionId", 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
-                DBRef target = (DBRef) object;\r
-                return target.getAccessionId();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    DBRef target = (DBRef) object;\r
-                    target.setAccessionId( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _accessionId\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-    } //-- jalview.schemabinding.version2.DBRefDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.DBRef.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/FeatureDescriptor.java b/src/jalview/schemabinding/version2/FeatureDescriptor.java
deleted file mode 100755 (executable)
index d0b9372..0000000
+++ /dev/null
@@ -1,477 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class FeatureDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class FeatureDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public FeatureDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "feature";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _begin\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_begin", "begin", 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
-                Feature target = (Feature) object;\r
-                if(!target.hasBegin())\r
-                    return null;\r
-                return new java.lang.Integer(target.getBegin());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Feature target = (Feature) object;\r
-                    // ignore null values for non optional primitives\r
-                    if (value == null) return;\r
-                    \r
-                    target.setBegin( ((java.lang.Integer)value).intValue());\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _begin\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _end\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_end", "end", 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
-                Feature target = (Feature) object;\r
-                if(!target.hasEnd())\r
-                    return null;\r
-                return new java.lang.Integer(target.getEnd());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Feature target = (Feature) object;\r
-                    // ignore null values for non optional primitives\r
-                    if (value == null) return;\r
-                    \r
-                    target.setEnd( ((java.lang.Integer)value).intValue());\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _end\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _type\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_type", "type", 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
-                Feature target = (Feature) object;\r
-                return target.getType();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Feature target = (Feature) object;\r
-                    target.setType( (java.lang.String) value);\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _type\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _description\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_description", "description", 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
-                Feature target = (Feature) object;\r
-                return target.getDescription();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Feature target = (Feature) object;\r
-                    target.setDescription( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _description\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _status\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_status", "status", 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
-                Feature target = (Feature) object;\r
-                return target.getStatus();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Feature target = (Feature) object;\r
-                    target.setStatus( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _status\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _featureGroup\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_featureGroup", "featureGroup", 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
-                Feature target = (Feature) object;\r
-                return target.getFeatureGroup();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Feature target = (Feature) object;\r
-                    target.setFeatureGroup( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _featureGroup\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _score\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(float.class, "_score", "score", 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
-                Feature target = (Feature) object;\r
-                if(!target.hasScore())\r
-                    return null;\r
-                return new java.lang.Float(target.getScore());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Feature target = (Feature) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteScore();\r
-                        return;\r
-                    }\r
-                    target.setScore( ((java.lang.Float)value).floatValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _score\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            FloatValidator typeValidator = new FloatValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-        //-- _otherDataList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.OtherData.class, "_otherDataList", "otherData", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                Feature target = (Feature) object;\r
-                return target.getOtherData();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Feature target = (Feature) object;\r
-                    target.addOtherData( (jalview.schemabinding.version2.OtherData) value);\r
-                }\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 new jalview.schemabinding.version2.OtherData();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _otherDataList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.FeatureDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.Feature.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/FeatureSettingsDescriptor.java b/src/jalview/schemabinding/version2/FeatureSettingsDescriptor.java
deleted file mode 100755 (executable)
index 6b55286..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class FeatureSettingsDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class FeatureSettingsDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public FeatureSettingsDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "FeatureSettings";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- initialize element descriptors\r
-        \r
-        //-- _settingList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.Setting.class, "_settingList", "setting", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                FeatureSettings target = (FeatureSettings) object;\r
-                return target.getSetting();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    FeatureSettings target = (FeatureSettings) object;\r
-                    target.addSetting( (jalview.schemabinding.version2.Setting) value);\r
-                }\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 new jalview.schemabinding.version2.Setting();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _settingList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _groupList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.Group.class, "_groupList", "group", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                FeatureSettings target = (FeatureSettings) object;\r
-                return target.getGroup();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    FeatureSettings target = (FeatureSettings) object;\r
-                    target.addGroup( (jalview.schemabinding.version2.Group) value);\r
-                }\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 new jalview.schemabinding.version2.Group();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _groupList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.FeatureSettingsDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.FeatureSettings.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/FeaturesDescriptor.java b/src/jalview/schemabinding/version2/FeaturesDescriptor.java
deleted file mode 100755 (executable)
index 5eea818..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class FeaturesDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class FeaturesDescriptor extends FeatureDescriptor {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public FeaturesDescriptor() {\r
-        super();\r
-        setExtendsWithoutFlatten(new FeatureDescriptor());\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "features";\r
-    } //-- jalview.schemabinding.version2.FeaturesDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return super.getExtends();\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        if (identity == null)\r
-            return super.getIdentity();\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.Features.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/GroupDescriptor.java b/src/jalview/schemabinding/version2/GroupDescriptor.java
deleted file mode 100644 (file)
index c41175b..0000000
+++ /dev/null
@@ -1,249 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class GroupDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class GroupDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public GroupDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "group";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _name\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", 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
-                Group target = (Group) object;\r
-                return target.getName();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Group target = (Group) object;\r
-                    target.setName( (java.lang.String) value);\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _name\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _display\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_display", "display", 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
-                Group target = (Group) object;\r
-                if(!target.hasDisplay())\r
-                    return null;\r
-                return (target.getDisplay() ? 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
-                    Group target = (Group) object;\r
-                    // ignore null values for non optional primitives\r
-                    if (value == null) return;\r
-                    \r
-                    target.setDisplay( ((java.lang.Boolean)value).booleanValue());\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _display\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-    } //-- jalview.schemabinding.version2.GroupDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.Group.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/HiddenColumnsDescriptor.java b/src/jalview/schemabinding/version2/HiddenColumnsDescriptor.java
deleted file mode 100644 (file)
index df99628..0000000
+++ /dev/null
@@ -1,252 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class HiddenColumnsDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class HiddenColumnsDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public HiddenColumnsDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "hiddenColumns";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _start\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_start", "start", 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
-                HiddenColumns target = (HiddenColumns) object;\r
-                if(!target.hasStart())\r
-                    return null;\r
-                return new java.lang.Integer(target.getStart());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    HiddenColumns target = (HiddenColumns) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteStart();\r
-                        return;\r
-                    }\r
-                    target.setStart( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _start\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _end\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_end", "end", 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
-                HiddenColumns target = (HiddenColumns) object;\r
-                if(!target.hasEnd())\r
-                    return null;\r
-                return new java.lang.Integer(target.getEnd());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    HiddenColumns target = (HiddenColumns) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteEnd();\r
-                        return;\r
-                    }\r
-                    target.setEnd( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _end\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-    } //-- jalview.schemabinding.version2.HiddenColumnsDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.HiddenColumns.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/JGroupDescriptor.java b/src/jalview/schemabinding/version2/JGroupDescriptor.java
deleted file mode 100755 (executable)
index 1985c61..0000000
+++ /dev/null
@@ -1,737 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class JGroupDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class JGroupDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public JGroupDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "JGroup";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _start\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_start", "start", 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.hasStart())\r
-                    return null;\r
-                return new java.lang.Integer(target.getStart());\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.deleteStart();\r
-                        return;\r
-                    }\r
-                    target.setStart( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _start\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _end\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_end", "end", 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.hasEnd())\r
-                    return null;\r
-                return new java.lang.Integer(target.getEnd());\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.deleteEnd();\r
-                        return;\r
-                    }\r
-                    target.setEnd( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _end\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _name\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", 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.getName();\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.setName( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _name\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _colour\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_colour", "colour", 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.getColour();\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.setColour( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _colour\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _consThreshold\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_consThreshold", "consThreshold", 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.hasConsThreshold())\r
-                    return null;\r
-                return new java.lang.Integer(target.getConsThreshold());\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.deleteConsThreshold();\r
-                        return;\r
-                    }\r
-                    target.setConsThreshold( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _consThreshold\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _pidThreshold\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_pidThreshold", "pidThreshold", 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.hasPidThreshold())\r
-                    return null;\r
-                return new java.lang.Integer(target.getPidThreshold());\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.deletePidThreshold();\r
-                        return;\r
-                    }\r
-                    target.setPidThreshold( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _pidThreshold\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _outlineColour\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_outlineColour", "outlineColour", 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.hasOutlineColour())\r
-                    return null;\r
-                return new java.lang.Integer(target.getOutlineColour());\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.deleteOutlineColour();\r
-                        return;\r
-                    }\r
-                    target.setOutlineColour( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _outlineColour\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _displayBoxes\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_displayBoxes", "displayBoxes", 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.hasDisplayBoxes())\r
-                    return null;\r
-                return (target.getDisplayBoxes() ? 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.deleteDisplayBoxes();\r
-                        return;\r
-                    }\r
-                    target.setDisplayBoxes( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _displayBoxes\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _displayText\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_displayText", "displayText", 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.hasDisplayText())\r
-                    return null;\r
-                return (target.getDisplayText() ? 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.deleteDisplayText();\r
-                        return;\r
-                    }\r
-                    target.setDisplayText( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _displayText\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _colourText\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_colourText", "colourText", 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.hasColourText())\r
-                    return null;\r
-                return (target.getColourText() ? 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.deleteColourText();\r
-                        return;\r
-                    }\r
-                    target.setColourText( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _colourText\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _textCol1\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textCol1", "textCol1", 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.hasTextCol1())\r
-                    return null;\r
-                return new java.lang.Integer(target.getTextCol1());\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.deleteTextCol1();\r
-                        return;\r
-                    }\r
-                    target.setTextCol1( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _textCol1\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _textCol2\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textCol2", "textCol2", 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.hasTextCol2())\r
-                    return null;\r
-                return new java.lang.Integer(target.getTextCol2());\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.deleteTextCol2();\r
-                        return;\r
-                    }\r
-                    target.setTextCol2( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _textCol2\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _textColThreshold\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textColThreshold", "textColThreshold", 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.hasTextColThreshold())\r
-                    return null;\r
-                return new java.lang.Integer(target.getTextColThreshold());\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.deleteTextColThreshold();\r
-                        return;\r
-                    }\r
-                    target.setTextColThreshold( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _textColThreshold\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-        //-- _seqList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_seqList", "seq", org.exolab.castor.xml.NodeType.Element);\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.getSeq();\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
-                    // ignore null values for non optional primitives\r
-                    if (value == null) return;\r
-                    \r
-                    target.addSeq( ((java.lang.Integer)value).intValue());\r
-                }\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.setNameSpaceURI("www.jalview.org");\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _seqList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.JGroupDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.JGroup.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/JSeqDescriptor.java b/src/jalview/schemabinding/version2/JSeqDescriptor.java
deleted file mode 100755 (executable)
index eef74d2..0000000
+++ /dev/null
@@ -1,488 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class JSeqDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class JSeqDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public JSeqDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "JSeq";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _colour\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_colour", "colour", 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
-                JSeq target = (JSeq) object;\r
-                if(!target.hasColour())\r
-                    return null;\r
-                return new java.lang.Integer(target.getColour());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JSeq target = (JSeq) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteColour();\r
-                        return;\r
-                    }\r
-                    target.setColour( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _colour\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _start\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_start", "start", 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
-                JSeq target = (JSeq) object;\r
-                if(!target.hasStart())\r
-                    return null;\r
-                return new java.lang.Integer(target.getStart());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JSeq target = (JSeq) object;\r
-                    // ignore null values for non optional primitives\r
-                    if (value == null) return;\r
-                    \r
-                    target.setStart( ((java.lang.Integer)value).intValue());\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _start\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _end\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_end", "end", 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
-                JSeq target = (JSeq) object;\r
-                if(!target.hasEnd())\r
-                    return null;\r
-                return new java.lang.Integer(target.getEnd());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JSeq target = (JSeq) object;\r
-                    // ignore null values for non optional primitives\r
-                    if (value == null) return;\r
-                    \r
-                    target.setEnd( ((java.lang.Integer)value).intValue());\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _end\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _id\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_id", "id", 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
-                JSeq target = (JSeq) object;\r
-                if(!target.hasId())\r
-                    return null;\r
-                return new java.lang.Integer(target.getId());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JSeq target = (JSeq) object;\r
-                    // ignore null values for non optional primitives\r
-                    if (value == null) return;\r
-                    \r
-                    target.setId( ((java.lang.Integer)value).intValue());\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _id\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _hidden\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_hidden", "hidden", 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
-                JSeq target = (JSeq) object;\r
-                if(!target.hasHidden())\r
-                    return null;\r
-                return (target.getHidden() ? 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
-                    JSeq target = (JSeq) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteHidden();\r
-                        return;\r
-                    }\r
-                    target.setHidden( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _hidden\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-        //-- _featuresList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.Features.class, "_featuresList", "features", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                JSeq target = (JSeq) object;\r
-                return target.getFeatures();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JSeq target = (JSeq) object;\r
-                    target.addFeatures( (jalview.schemabinding.version2.Features) value);\r
-                }\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 new jalview.schemabinding.version2.Features();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _featuresList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _pdbidsList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.Pdbids.class, "_pdbidsList", "pdbids", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                JSeq target = (JSeq) object;\r
-                return target.getPdbids();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JSeq target = (JSeq) object;\r
-                    target.addPdbids( (jalview.schemabinding.version2.Pdbids) value);\r
-                }\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 new jalview.schemabinding.version2.Pdbids();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _pdbidsList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _hiddenSequencesList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_hiddenSequencesList", "hiddenSequences", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                JSeq target = (JSeq) object;\r
-                return target.getHiddenSequences();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JSeq target = (JSeq) object;\r
-                    // ignore null values for non optional primitives\r
-                    if (value == null) return;\r
-                    \r
-                    target.addHiddenSequences( ((java.lang.Integer)value).intValue());\r
-                }\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.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _hiddenSequencesList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.JSeqDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.JSeq.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/JalviewModelDescriptor.java b/src/jalview/schemabinding/version2/JalviewModelDescriptor.java
deleted file mode 100755 (executable)
index ad2dc13..0000000
+++ /dev/null
@@ -1,324 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class JalviewModelDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class JalviewModelDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public JalviewModelDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "JalviewModel";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- initialize element descriptors\r
-        \r
-        //-- _creationDate\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.util.Date.class, "_creationDate", "creationDate", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                JalviewModel target = (JalviewModel) object;\r
-                return target.getCreationDate();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JalviewModel target = (JalviewModel) object;\r
-                    target.setCreationDate( (java.util.Date) value);\r
-                }\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 new java.util.Date();\r
-            }\r
-        } );\r
-        desc.setHandler( new org.exolab.castor.xml.handlers.DateFieldHandler(handler));\r
-        desc.setImmutable(true);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _creationDate\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _version\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_version", "version", org.exolab.castor.xml.NodeType.Element);\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
-                JalviewModel target = (JalviewModel) object;\r
-                return target.getVersion();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JalviewModel target = (JalviewModel) object;\r
-                    target.setVersion( (java.lang.String) value);\r
-                }\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.setNameSpaceURI("www.jalview.org");\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _version\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _vamsasModel\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.VamsasModel.class, "_vamsasModel", "vamsasModel", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                JalviewModel target = (JalviewModel) object;\r
-                return target.getVamsasModel();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JalviewModel target = (JalviewModel) object;\r
-                    target.setVamsasModel( (jalview.schemabinding.version2.VamsasModel) value);\r
-                }\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 new jalview.schemabinding.version2.VamsasModel();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _vamsasModel\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _jalviewModelSequence\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.JalviewModelSequence.class, "_jalviewModelSequence", "-error-if-this-is-used-", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                JalviewModel target = (JalviewModel) object;\r
-                return target.getJalviewModelSequence();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JalviewModel target = (JalviewModel) object;\r
-                    target.setJalviewModelSequence( (jalview.schemabinding.version2.JalviewModelSequence) value);\r
-                }\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 new jalview.schemabinding.version2.JalviewModelSequence();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setContainer(true);\r
-        desc.setClassDescriptor(new jalview.schemabinding.version2.JalviewModelSequenceDescriptor());\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _jalviewModelSequence\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.JalviewModelDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.JalviewModel.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/JalviewModelSequenceDescriptor.java b/src/jalview/schemabinding/version2/JalviewModelSequenceDescriptor.java
deleted file mode 100755 (executable)
index 7f5bd43..0000000
+++ /dev/null
@@ -1,383 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class JalviewModelSequenceDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class JalviewModelSequenceDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public JalviewModelSequenceDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- initialize element descriptors\r
-        \r
-        //-- _JSeqList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.JSeq.class, "_JSeqList", "JSeq", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                JalviewModelSequence target = (JalviewModelSequence) object;\r
-                return target.getJSeq();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JalviewModelSequence target = (JalviewModelSequence) object;\r
-                    target.addJSeq( (jalview.schemabinding.version2.JSeq) value);\r
-                }\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 new jalview.schemabinding.version2.JSeq();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _JSeqList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _JGroupList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.JGroup.class, "_JGroupList", "JGroup", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                JalviewModelSequence target = (JalviewModelSequence) object;\r
-                return target.getJGroup();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JalviewModelSequence target = (JalviewModelSequence) object;\r
-                    target.addJGroup( (jalview.schemabinding.version2.JGroup) value);\r
-                }\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 new jalview.schemabinding.version2.JGroup();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _JGroupList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _viewportList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.Viewport.class, "_viewportList", "Viewport", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                JalviewModelSequence target = (JalviewModelSequence) object;\r
-                return target.getViewport();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JalviewModelSequence target = (JalviewModelSequence) object;\r
-                    target.addViewport( (jalview.schemabinding.version2.Viewport) value);\r
-                }\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 new jalview.schemabinding.version2.Viewport();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _viewportList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _userColoursList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.UserColours.class, "_userColoursList", "UserColours", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                JalviewModelSequence target = (JalviewModelSequence) object;\r
-                return target.getUserColours();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JalviewModelSequence target = (JalviewModelSequence) object;\r
-                    target.addUserColours( (jalview.schemabinding.version2.UserColours) value);\r
-                }\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 new jalview.schemabinding.version2.UserColours();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _userColoursList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _treeList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.Tree.class, "_treeList", "tree", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                JalviewModelSequence target = (JalviewModelSequence) object;\r
-                return target.getTree();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JalviewModelSequence target = (JalviewModelSequence) object;\r
-                    target.addTree( (jalview.schemabinding.version2.Tree) value);\r
-                }\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 new jalview.schemabinding.version2.Tree();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _treeList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _featureSettings\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.FeatureSettings.class, "_featureSettings", "FeatureSettings", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                JalviewModelSequence target = (JalviewModelSequence) object;\r
-                return target.getFeatureSettings();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JalviewModelSequence target = (JalviewModelSequence) object;\r
-                    target.setFeatureSettings( (jalview.schemabinding.version2.FeatureSettings) value);\r
-                }\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 new jalview.schemabinding.version2.FeatureSettings();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _featureSettings\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.JalviewModelSequenceDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.JalviewModelSequence.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/JalviewUserColoursDescriptor.java b/src/jalview/schemabinding/version2/JalviewUserColoursDescriptor.java
deleted file mode 100755 (executable)
index 661d102..0000000
+++ /dev/null
@@ -1,244 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class JalviewUserColoursDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class JalviewUserColoursDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public JalviewUserColoursDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org/colours";\r
-        xmlName = "JalviewUserColours";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _schemeName\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_schemeName", "schemeName", 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
-                JalviewUserColours target = (JalviewUserColours) object;\r
-                return target.getSchemeName();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JalviewUserColours target = (JalviewUserColours) object;\r
-                    target.setSchemeName( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _schemeName\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-        //-- _colourList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.Colour.class, "_colourList", "colour", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                JalviewUserColours target = (JalviewUserColours) object;\r
-                return target.getColour();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    JalviewUserColours target = (JalviewUserColours) object;\r
-                    target.addColour( (jalview.schemabinding.version2.Colour) value);\r
-                }\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 new jalview.schemabinding.version2.Colour();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _colourList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.JalviewUserColoursDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.JalviewUserColours.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/OtherDataDescriptor.java b/src/jalview/schemabinding/version2/OtherDataDescriptor.java
deleted file mode 100644 (file)
index f6ec794..0000000
+++ /dev/null
@@ -1,246 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class OtherDataDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class OtherDataDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public OtherDataDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "otherData";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _key\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_key", "key", 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
-                OtherData target = (OtherData) object;\r
-                return target.getKey();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    OtherData target = (OtherData) object;\r
-                    target.setKey( (java.lang.String) value);\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _key\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _value\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_value", "value", 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
-                OtherData target = (OtherData) object;\r
-                return target.getValue();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    OtherData target = (OtherData) object;\r
-                    target.setValue( (java.lang.String) value);\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _value\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-    } //-- jalview.schemabinding.version2.OtherDataDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.OtherData.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/PdbentryDescriptor.java b/src/jalview/schemabinding/version2/PdbentryDescriptor.java
deleted file mode 100755 (executable)
index 61a9eda..0000000
+++ /dev/null
@@ -1,315 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class PdbentryDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class PdbentryDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public PdbentryDescriptor() {\r
-        super();\r
-        xmlName = "pdbentry";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \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
-                Pdbentry target = (Pdbentry) 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
-                    Pdbentry target = (Pdbentry) object;\r
-                    target.setId( (java.lang.String) value);\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _id\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _type\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_type", "type", 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
-                Pdbentry target = (Pdbentry) object;\r
-                return target.getType();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Pdbentry target = (Pdbentry) object;\r
-                    target.setType( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _type\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _file\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_file", "file", 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
-                Pdbentry target = (Pdbentry) object;\r
-                return target.getFile();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Pdbentry target = (Pdbentry) object;\r
-                    target.setFile( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _file\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-        //-- _items\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.PdbentryItem.class, "_items", (String)null, org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                Pdbentry target = (Pdbentry) object;\r
-                return target.getPdbentryItem();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Pdbentry target = (Pdbentry) object;\r
-                    target.addPdbentryItem( (jalview.schemabinding.version2.PdbentryItem) value);\r
-                }\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 new jalview.schemabinding.version2.PdbentryItem();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setContainer(true);\r
-        desc.setClassDescriptor(new jalview.schemabinding.version2.PdbentryItemDescriptor());\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _items\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.PdbentryDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.Pdbentry.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/PdbentryItemDescriptor.java b/src/jalview/schemabinding/version2/PdbentryItemDescriptor.java
deleted file mode 100755 (executable)
index d9d36c0..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class PdbentryItemDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class PdbentryItemDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public PdbentryItemDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "pdbentry";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- initialize element descriptors\r
-        \r
-        //-- _propertyList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.Property.class, "_propertyList", "property", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                PdbentryItem target = (PdbentryItem) object;\r
-                return target.getProperty();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    PdbentryItem target = (PdbentryItem) object;\r
-                    target.addProperty( (jalview.schemabinding.version2.Property) value);\r
-                }\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 new jalview.schemabinding.version2.Property();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _propertyList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.PdbentryItemDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.PdbentryItem.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/PdbidsDescriptor.java b/src/jalview/schemabinding/version2/PdbidsDescriptor.java
deleted file mode 100755 (executable)
index d96b776..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class PdbidsDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class PdbidsDescriptor extends jalview.schemabinding.version2.PdbentryDescriptor {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public PdbidsDescriptor() {\r
-        super();\r
-        setExtendsWithoutFlatten(new jalview.schemabinding.version2.PdbentryDescriptor());\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "pdbids";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- initialize element descriptors\r
-        \r
-        //-- _structureStateList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.StructureState.class, "_structureStateList", "structureState", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                Pdbids target = (Pdbids) object;\r
-                return target.getStructureState();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Pdbids target = (Pdbids) object;\r
-                    target.addStructureState( (jalview.schemabinding.version2.StructureState) value);\r
-                }\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 new jalview.schemabinding.version2.StructureState();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _structureStateList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.PdbidsDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return super.getExtends();\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        if (identity == null)\r
-            return super.getIdentity();\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.Pdbids.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/PropertyDescriptor.java b/src/jalview/schemabinding/version2/PropertyDescriptor.java
deleted file mode 100755 (executable)
index e22704c..0000000
+++ /dev/null
@@ -1,246 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class PropertyDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class PropertyDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public PropertyDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "property";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _name\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", 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
-                Property target = (Property) object;\r
-                return target.getName();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Property target = (Property) object;\r
-                    target.setName( (java.lang.String) value);\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _name\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _value\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_value", "value", 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
-                Property target = (Property) object;\r
-                return target.getValue();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Property target = (Property) object;\r
-                    target.setValue( (java.lang.String) value);\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _value\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-    } //-- jalview.schemabinding.version2.PropertyDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.Property.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/SequenceDescriptor.java b/src/jalview/schemabinding/version2/SequenceDescriptor.java
deleted file mode 100755 (executable)
index 555284a..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class SequenceDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class SequenceDescriptor extends jalview.schemabinding.version2.SequenceTypeDescriptor {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public SequenceDescriptor() {\r
-        super();\r
-        setExtendsWithoutFlatten(new jalview.schemabinding.version2.SequenceTypeDescriptor());\r
-        nsURI = "www.vamsas.ac.uk/jalview/version2";\r
-        xmlName = "Sequence";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- initialize element descriptors\r
-        \r
-        //-- _DBRefList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.DBRef.class, "_DBRefList", "DBRef", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                Sequence target = (Sequence) object;\r
-                return target.getDBRef();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Sequence target = (Sequence) object;\r
-                    target.addDBRef( (jalview.schemabinding.version2.DBRef) value);\r
-                }\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 new jalview.schemabinding.version2.DBRef();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _DBRefList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.SequenceDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return super.getExtends();\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        if (identity == null)\r
-            return super.getIdentity();\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.Sequence.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/SequenceSetDescriptor.java b/src/jalview/schemabinding/version2/SequenceSetDescriptor.java
deleted file mode 100755 (executable)
index 22e00c3..0000000
+++ /dev/null
@@ -1,316 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class SequenceSetDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class SequenceSetDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public SequenceSetDescriptor() {\r
-        super();\r
-        nsURI = "www.vamsas.ac.uk/jalview/version2";\r
-        xmlName = "SequenceSet";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _gapChar\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_gapChar", "gapChar", 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
-                SequenceSet target = (SequenceSet) object;\r
-                return target.getGapChar();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    SequenceSet target = (SequenceSet) object;\r
-                    target.setGapChar( (java.lang.String) value);\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _gapChar\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-        //-- _sequenceList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.Sequence.class, "_sequenceList", "Sequence", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                SequenceSet target = (SequenceSet) object;\r
-                return target.getSequence();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    SequenceSet target = (SequenceSet) object;\r
-                    target.addSequence( (jalview.schemabinding.version2.Sequence) value);\r
-                }\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 new jalview.schemabinding.version2.Sequence();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _sequenceList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _annotationList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.Annotation.class, "_annotationList", "Annotation", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                SequenceSet target = (SequenceSet) object;\r
-                return target.getAnnotation();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    SequenceSet target = (SequenceSet) object;\r
-                    target.addAnnotation( (jalview.schemabinding.version2.Annotation) value);\r
-                }\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 new jalview.schemabinding.version2.Annotation();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _annotationList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _sequenceSetPropertiesList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.SequenceSetProperties.class, "_sequenceSetPropertiesList", "sequenceSetProperties", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                SequenceSet target = (SequenceSet) object;\r
-                return target.getSequenceSetProperties();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    SequenceSet target = (SequenceSet) object;\r
-                    target.addSequenceSetProperties( (jalview.schemabinding.version2.SequenceSetProperties) value);\r
-                }\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 new jalview.schemabinding.version2.SequenceSetProperties();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _sequenceSetPropertiesList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.SequenceSetDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.SequenceSet.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/SequenceSetPropertiesDescriptor.java b/src/jalview/schemabinding/version2/SequenceSetPropertiesDescriptor.java
deleted file mode 100644 (file)
index 7d45070..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class SequenceSetPropertiesDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class SequenceSetPropertiesDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public SequenceSetPropertiesDescriptor() {\r
-        super();\r
-        nsURI = "www.vamsas.ac.uk/jalview/version2";\r
-        xmlName = "sequenceSetProperties";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _key\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_key", "key", 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
-                SequenceSetProperties target = (SequenceSetProperties) object;\r
-                return target.getKey();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    SequenceSetProperties target = (SequenceSetProperties) object;\r
-                    target.setKey( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _key\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _value\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_value", "value", 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
-                SequenceSetProperties target = (SequenceSetProperties) object;\r
-                return target.getValue();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    SequenceSetProperties target = (SequenceSetProperties) object;\r
-                    target.setValue( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _value\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-    } //-- jalview.schemabinding.version2.SequenceSetPropertiesDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.SequenceSetProperties.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/SequenceTypeDescriptor.java b/src/jalview/schemabinding/version2/SequenceTypeDescriptor.java
deleted file mode 100755 (executable)
index ef6c636..0000000
+++ /dev/null
@@ -1,321 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class SequenceTypeDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class SequenceTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public SequenceTypeDescriptor() {\r
-        super();\r
-        nsURI = "www.vamsas.ac.uk/jalview/version2";\r
-        xmlName = "SequenceType";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \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
-                SequenceType target = (SequenceType) 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
-                    SequenceType target = (SequenceType) object;\r
-                    target.setId( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _id\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _description\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_description", "description", 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
-                SequenceType target = (SequenceType) object;\r
-                return target.getDescription();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    SequenceType target = (SequenceType) object;\r
-                    target.setDescription( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _description\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-        //-- _sequence\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_sequence", "sequence", org.exolab.castor.xml.NodeType.Element);\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
-                SequenceType target = (SequenceType) object;\r
-                return target.getSequence();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    SequenceType target = (SequenceType) object;\r
-                    target.setSequence( (java.lang.String) value);\r
-                }\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.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _sequence\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _name\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", org.exolab.castor.xml.NodeType.Element);\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
-                SequenceType target = (SequenceType) object;\r
-                return target.getName();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    SequenceType target = (SequenceType) object;\r
-                    target.setName( (java.lang.String) value);\r
-                }\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.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _name\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.SequenceTypeDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.SequenceType.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/SettingDescriptor.java b/src/jalview/schemabinding/version2/SettingDescriptor.java
deleted file mode 100755 (executable)
index a96d57d..0000000
+++ /dev/null
@@ -1,331 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class SettingDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class SettingDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public SettingDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "setting";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _type\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_type", "type", 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
-                Setting target = (Setting) object;\r
-                return target.getType();\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
-                    target.setType( (java.lang.String) value);\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _type\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _colour\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_colour", "colour", 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.hasColour())\r
-                    return null;\r
-                return new java.lang.Integer(target.getColour());\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
-                    // ignore null values for non optional primitives\r
-                    if (value == null) return;\r
-                    \r
-                    target.setColour( ((java.lang.Integer)value).intValue());\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _colour\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _display\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_display", "display", 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.hasDisplay())\r
-                    return null;\r
-                return (target.getDisplay() ? 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
-                    // ignore null values for non optional primitives\r
-                    if (value == null) return;\r
-                    \r
-                    target.setDisplay( ((java.lang.Boolean)value).booleanValue());\r
-                }\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.setRequired(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _display\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _order\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(float.class, "_order", "order", 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.hasOrder())\r
-                    return null;\r
-                return new java.lang.Float(target.getOrder());\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.deleteOrder();\r
-                        return;\r
-                    }\r
-                    target.setOrder( ((java.lang.Float)value).floatValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _order\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            FloatValidator typeValidator = new FloatValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-    } //-- jalview.schemabinding.version2.SettingDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.Setting.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/StructureStateDescriptor.java b/src/jalview/schemabinding/version2/StructureStateDescriptor.java
deleted file mode 100644 (file)
index e7a5a4d..0000000
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package jalview.schemabinding.version2;
-
-  //---------------------------------/
- //- Imported classes and packages -/
-//---------------------------------/
-
-import org.exolab.castor.mapping.AccessMode;
-import org.exolab.castor.xml.TypeValidator;
-import org.exolab.castor.xml.XMLFieldDescriptor;
-import org.exolab.castor.xml.validators.*;
-
-/**
- * Class StructureStateDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class StructureStateDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
-
-
-      //--------------------------/
-     //- Class/Member Variables -/
-    //--------------------------/
-
-    /**
-     * Field nsPrefix
-     */
-    private java.lang.String nsPrefix;
-
-    /**
-     * Field nsURI
-     */
-    private java.lang.String nsURI;
-
-    /**
-     * Field xmlName
-     */
-    private java.lang.String xmlName;
-
-    /**
-     * Field identity
-     */
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;
-
-
-      //----------------/
-     //- Constructors -/
-    //----------------/
-
-    public StructureStateDescriptor() {
-        super();
-        nsURI = "www.jalview.org";
-        xmlName = "structureState";
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- _content
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_content", "PCDATA", org.exolab.castor.xml.NodeType.Text);
-        desc.setImmutable(true);
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                StructureState target = (StructureState) object;
-                return target.getContent();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    StructureState target = (StructureState) object;
-                    target.setContent( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        } );
-        desc.setHandler(handler);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _content
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize attribute descriptors
-        
-        //-- _visible
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_visible", "visible", org.exolab.castor.xml.NodeType.Attribute);
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                StructureState target = (StructureState) object;
-                if(!target.hasVisible())
-                    return null;
-                return (target.getVisible() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    StructureState target = (StructureState) object;
-                    // if null, use delete method for optional primitives 
-                    if (value == null) {
-                        target.deleteVisible();
-                        return;
-                    }
-                    target.setVisible( ((java.lang.Boolean)value).booleanValue());
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        } );
-        desc.setHandler(handler);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _visible
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            BooleanValidator typeValidator = new BooleanValidator();
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _xpos
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_xpos", "xpos", org.exolab.castor.xml.NodeType.Attribute);
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                StructureState target = (StructureState) object;
-                if(!target.hasXpos())
-                    return null;
-                return new java.lang.Integer(target.getXpos());
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    StructureState target = (StructureState) object;
-                    // if null, use delete method for optional primitives 
-                    if (value == null) {
-                        target.deleteXpos();
-                        return;
-                    }
-                    target.setXpos( ((java.lang.Integer)value).intValue());
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        } );
-        desc.setHandler(handler);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _xpos
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            IntegerValidator typeValidator= new IntegerValidator();
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _ypos
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_ypos", "ypos", org.exolab.castor.xml.NodeType.Attribute);
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                StructureState target = (StructureState) object;
-                if(!target.hasYpos())
-                    return null;
-                return new java.lang.Integer(target.getYpos());
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    StructureState target = (StructureState) object;
-                    // if null, use delete method for optional primitives 
-                    if (value == null) {
-                        target.deleteYpos();
-                        return;
-                    }
-                    target.setYpos( ((java.lang.Integer)value).intValue());
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        } );
-        desc.setHandler(handler);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _ypos
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            IntegerValidator typeValidator= new IntegerValidator();
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _width
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_width", "width", org.exolab.castor.xml.NodeType.Attribute);
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                StructureState target = (StructureState) object;
-                if(!target.hasWidth())
-                    return null;
-                return new java.lang.Integer(target.getWidth());
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    StructureState target = (StructureState) object;
-                    // if null, use delete method for optional primitives 
-                    if (value == null) {
-                        target.deleteWidth();
-                        return;
-                    }
-                    target.setWidth( ((java.lang.Integer)value).intValue());
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        } );
-        desc.setHandler(handler);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _width
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            IntegerValidator typeValidator= new IntegerValidator();
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _height
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_height", "height", org.exolab.castor.xml.NodeType.Attribute);
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                StructureState target = (StructureState) object;
-                if(!target.hasHeight())
-                    return null;
-                return new java.lang.Integer(target.getHeight());
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    StructureState target = (StructureState) object;
-                    // if null, use delete method for optional primitives 
-                    if (value == null) {
-                        target.deleteHeight();
-                        return;
-                    }
-                    target.setHeight( ((java.lang.Integer)value).intValue());
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        } );
-        desc.setHandler(handler);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _height
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            IntegerValidator typeValidator= new IntegerValidator();
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-    } //-- jalview.schemabinding.version2.StructureStateDescriptor()
-
-
-      //-----------/
-     //- Methods -/
-    //-----------/
-
-    /**
-     * Method getAccessMode
-     * 
-     * 
-     * 
-     * @return AccessMode
-     */
-    public org.exolab.castor.mapping.AccessMode getAccessMode()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() 
-
-    /**
-     * Method getExtends
-     * 
-     * 
-     * 
-     * @return ClassDescriptor
-     */
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()
-    {
-        return null;
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return jalview.schemabinding.version2.StructureState.class;
-    } //-- java.lang.Class getJavaClass() 
-
-    /**
-     * Method getNameSpacePrefix
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpacePrefix()
-    {
-        return nsPrefix;
-    } //-- java.lang.String getNameSpacePrefix() 
-
-    /**
-     * Method getNameSpaceURI
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getNameSpaceURI()
-    {
-        return nsURI;
-    } //-- java.lang.String getNameSpaceURI() 
-
-    /**
-     * Method getValidator
-     * 
-     * 
-     * 
-     * @return TypeValidator
-     */
-    public org.exolab.castor.xml.TypeValidator getValidator()
-    {
-        return this;
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() 
-
-    /**
-     * Method getXMLName
-     * 
-     * 
-     * 
-     * @return String
-     */
-    public java.lang.String getXMLName()
-    {
-        return xmlName;
-    } //-- java.lang.String getXMLName() 
-
-}
diff --git a/src/jalview/schemabinding/version2/ThresholdLineDescriptor.java b/src/jalview/schemabinding/version2/ThresholdLineDescriptor.java
deleted file mode 100755 (executable)
index 9241003..0000000
+++ /dev/null
@@ -1,288 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class ThresholdLineDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class ThresholdLineDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public ThresholdLineDescriptor() {\r
-        super();\r
-        nsURI = "www.vamsas.ac.uk/jalview/version2";\r
-        xmlName = "thresholdLine";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _label\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_label", "label", 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
-                ThresholdLine target = (ThresholdLine) object;\r
-                return target.getLabel();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    ThresholdLine target = (ThresholdLine) object;\r
-                    target.setLabel( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _label\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _value\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(float.class, "_value", "value", 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
-                ThresholdLine target = (ThresholdLine) object;\r
-                if(!target.hasValue())\r
-                    return null;\r
-                return new java.lang.Float(target.getValue());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    ThresholdLine target = (ThresholdLine) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteValue();\r
-                        return;\r
-                    }\r
-                    target.setValue( ((java.lang.Float)value).floatValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _value\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            FloatValidator typeValidator = new FloatValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _colour\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_colour", "colour", 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
-                ThresholdLine target = (ThresholdLine) object;\r
-                if(!target.hasColour())\r
-                    return null;\r
-                return new java.lang.Integer(target.getColour());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    ThresholdLine target = (ThresholdLine) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteColour();\r
-                        return;\r
-                    }\r
-                    target.setColour( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _colour\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-    } //-- jalview.schemabinding.version2.ThresholdLineDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.ThresholdLine.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/TreeDescriptor.java b/src/jalview/schemabinding/version2/TreeDescriptor.java
deleted file mode 100755 (executable)
index 5232c12..0000000
+++ /dev/null
@@ -1,777 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class TreeDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public TreeDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "tree";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _width\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_width", "width", 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
-                Tree target = (Tree) object;\r
-                if(!target.hasWidth())\r
-                    return null;\r
-                return new java.lang.Integer(target.getWidth());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Tree target = (Tree) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteWidth();\r
-                        return;\r
-                    }\r
-                    target.setWidth( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _width\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _height\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_height", "height", 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
-                Tree target = (Tree) object;\r
-                if(!target.hasHeight())\r
-                    return null;\r
-                return new java.lang.Integer(target.getHeight());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Tree target = (Tree) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteHeight();\r
-                        return;\r
-                    }\r
-                    target.setHeight( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _height\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\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
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                Tree target = (Tree) object;\r
-                if(!target.hasXpos())\r
-                    return null;\r
-                return new java.lang.Integer(target.getXpos());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Tree target = (Tree) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteXpos();\r
-                        return;\r
-                    }\r
-                    target.setXpos( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _xpos\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _ypos\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_ypos", "ypos", 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
-                Tree target = (Tree) object;\r
-                if(!target.hasYpos())\r
-                    return null;\r
-                return new java.lang.Integer(target.getYpos());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Tree target = (Tree) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteYpos();\r
-                        return;\r
-                    }\r
-                    target.setYpos( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _ypos\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _fontName\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_fontName", "fontName", 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
-                Tree target = (Tree) object;\r
-                return target.getFontName();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Tree target = (Tree) object;\r
-                    target.setFontName( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _fontName\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _fontSize\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_fontSize", "fontSize", 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
-                Tree target = (Tree) object;\r
-                if(!target.hasFontSize())\r
-                    return null;\r
-                return new java.lang.Integer(target.getFontSize());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Tree target = (Tree) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteFontSize();\r
-                        return;\r
-                    }\r
-                    target.setFontSize( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _fontSize\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _fontStyle\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_fontStyle", "fontStyle", 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
-                Tree target = (Tree) object;\r
-                if(!target.hasFontStyle())\r
-                    return null;\r
-                return new java.lang.Integer(target.getFontStyle());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Tree target = (Tree) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteFontStyle();\r
-                        return;\r
-                    }\r
-                    target.setFontStyle( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _fontStyle\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _threshold\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(float.class, "_threshold", "threshold", 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
-                Tree target = (Tree) object;\r
-                if(!target.hasThreshold())\r
-                    return null;\r
-                return new java.lang.Float(target.getThreshold());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Tree target = (Tree) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteThreshold();\r
-                        return;\r
-                    }\r
-                    target.setThreshold( ((java.lang.Float)value).floatValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _threshold\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            FloatValidator typeValidator = new FloatValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _showBootstrap\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showBootstrap", "showBootstrap", 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
-                Tree target = (Tree) object;\r
-                if(!target.hasShowBootstrap())\r
-                    return null;\r
-                return (target.getShowBootstrap() ? 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
-                    Tree target = (Tree) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteShowBootstrap();\r
-                        return;\r
-                    }\r
-                    target.setShowBootstrap( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _showBootstrap\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _showDistances\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showDistances", "showDistances", 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
-                Tree target = (Tree) object;\r
-                if(!target.hasShowDistances())\r
-                    return null;\r
-                return (target.getShowDistances() ? 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
-                    Tree target = (Tree) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteShowDistances();\r
-                        return;\r
-                    }\r
-                    target.setShowDistances( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _showDistances\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _markUnlinked\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_markUnlinked", "markUnlinked", 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
-                Tree target = (Tree) object;\r
-                if(!target.hasMarkUnlinked())\r
-                    return null;\r
-                return (target.getMarkUnlinked() ? 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
-                    Tree target = (Tree) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteMarkUnlinked();\r
-                        return;\r
-                    }\r
-                    target.setMarkUnlinked( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _markUnlinked\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _fitToWindow\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_fitToWindow", "fitToWindow", 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
-                Tree target = (Tree) object;\r
-                if(!target.hasFitToWindow())\r
-                    return null;\r
-                return (target.getFitToWindow() ? 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
-                    Tree target = (Tree) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteFitToWindow();\r
-                        return;\r
-                    }\r
-                    target.setFitToWindow( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _fitToWindow\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _currentTree\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_currentTree", "currentTree", 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
-                Tree target = (Tree) object;\r
-                if(!target.hasCurrentTree())\r
-                    return null;\r
-                return (target.getCurrentTree() ? 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
-                    Tree target = (Tree) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteCurrentTree();\r
-                        return;\r
-                    }\r
-                    target.setCurrentTree( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _currentTree\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-        //-- _title\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_title", "title", org.exolab.castor.xml.NodeType.Element);\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
-                Tree target = (Tree) object;\r
-                return target.getTitle();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Tree target = (Tree) object;\r
-                    target.setTitle( (java.lang.String) value);\r
-                }\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.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _title\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _newick\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_newick", "newick", org.exolab.castor.xml.NodeType.Element);\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
-                Tree target = (Tree) object;\r
-                return target.getNewick();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Tree target = (Tree) object;\r
-                    target.setNewick( (java.lang.String) value);\r
-                }\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.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _newick\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.TreeDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.Tree.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/UserColourSchemeDescriptor.java b/src/jalview/schemabinding/version2/UserColourSchemeDescriptor.java
deleted file mode 100755 (executable)
index cf86a11..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class UserColourSchemeDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class UserColourSchemeDescriptor extends JalviewUserColoursDescriptor {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public UserColourSchemeDescriptor() {\r
-        super();\r
-        setExtendsWithoutFlatten(new JalviewUserColoursDescriptor());\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "UserColourScheme";\r
-    } //-- jalview.schemabinding.version2.UserColourSchemeDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return super.getExtends();\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        if (identity == null)\r
-            return super.getIdentity();\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.UserColourScheme.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/UserColoursDescriptor.java b/src/jalview/schemabinding/version2/UserColoursDescriptor.java
deleted file mode 100755 (executable)
index 6c42d0b..0000000
+++ /dev/null
@@ -1,245 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class UserColoursDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class UserColoursDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public UserColoursDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "UserColours";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \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
-                UserColours target = (UserColours) 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
-                    UserColours target = (UserColours) object;\r
-                    target.setId( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _id\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-        //-- _userColourScheme\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.UserColourScheme.class, "_userColourScheme", "UserColourScheme", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                UserColours target = (UserColours) object;\r
-                return target.getUserColourScheme();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    UserColours target = (UserColours) object;\r
-                    target.setUserColourScheme( (jalview.schemabinding.version2.UserColourScheme) value);\r
-                }\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 new jalview.schemabinding.version2.UserColourScheme();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _userColourScheme\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.UserColoursDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.UserColours.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/VAMSASDescriptor.java b/src/jalview/schemabinding/version2/VAMSASDescriptor.java
deleted file mode 100755 (executable)
index fad185b..0000000
+++ /dev/null
@@ -1,247 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class VAMSASDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class VAMSASDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public VAMSASDescriptor() {\r
-        super();\r
-        nsURI = "www.vamsas.ac.uk/jalview/version2";\r
-        xmlName = "VAMSAS";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- initialize element descriptors\r
-        \r
-        //-- _treeList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_treeList", "Tree", org.exolab.castor.xml.NodeType.Element);\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
-                VAMSAS target = (VAMSAS) object;\r
-                return target.getTree();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    VAMSAS target = (VAMSAS) object;\r
-                    target.addTree( (java.lang.String) value);\r
-                }\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.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _treeList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _sequenceSetList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.SequenceSet.class, "_sequenceSetList", "SequenceSet", org.exolab.castor.xml.NodeType.Element);\r
-        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                VAMSAS target = (VAMSAS) object;\r
-                return target.getSequenceSet();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    VAMSAS target = (VAMSAS) object;\r
-                    target.addSequenceSet( (jalview.schemabinding.version2.SequenceSet) value);\r
-                }\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 new jalview.schemabinding.version2.SequenceSet();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.vamsas.ac.uk/jalview/version2");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _sequenceSetList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.VAMSASDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.VAMSAS.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/VamsasModelDescriptor.java b/src/jalview/schemabinding/version2/VamsasModelDescriptor.java
deleted file mode 100755 (executable)
index e40d9c8..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class VamsasModelDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class VamsasModelDescriptor extends VAMSASDescriptor {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public VamsasModelDescriptor() {\r
-        super();\r
-        setExtendsWithoutFlatten(new VAMSASDescriptor());\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "vamsasModel";\r
-    } //-- jalview.schemabinding.version2.VamsasModelDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return super.getExtends();\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        if (identity == null)\r
-            return super.getIdentity();\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.VamsasModel.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r
diff --git a/src/jalview/schemabinding/version2/ViewportDescriptor.java b/src/jalview/schemabinding/version2/ViewportDescriptor.java
deleted file mode 100755 (executable)
index 09544ef..0000000
+++ /dev/null
@@ -1,1447 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package jalview.schemabinding.version2;\r
-\r
-  //---------------------------------/\r
- //- Imported classes and packages -/\r
-//---------------------------------/\r
-\r
-import org.exolab.castor.mapping.AccessMode;\r
-import org.exolab.castor.xml.TypeValidator;\r
-import org.exolab.castor.xml.XMLFieldDescriptor;\r
-import org.exolab.castor.xml.validators.*;\r
-\r
-/**\r
- * Class ViewportDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class ViewportDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {\r
-\r
-\r
-      //--------------------------/\r
-     //- Class/Member Variables -/\r
-    //--------------------------/\r
-\r
-    /**\r
-     * Field nsPrefix\r
-     */\r
-    private java.lang.String nsPrefix;\r
-\r
-    /**\r
-     * Field nsURI\r
-     */\r
-    private java.lang.String nsURI;\r
-\r
-    /**\r
-     * Field xmlName\r
-     */\r
-    private java.lang.String xmlName;\r
-\r
-    /**\r
-     * Field identity\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor identity;\r
-\r
-\r
-      //----------------/\r
-     //- Constructors -/\r
-    //----------------/\r
-\r
-    public ViewportDescriptor() {\r
-        super();\r
-        nsURI = "www.jalview.org";\r
-        xmlName = "Viewport";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.xml.XMLFieldHandler              handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _conservationSelected\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_conservationSelected", "conservationSelected", 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.hasConservationSelected())\r
-                    return null;\r
-                return (target.getConservationSelected() ? 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.deleteConservationSelected();\r
-                        return;\r
-                    }\r
-                    target.setConservationSelected( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _conservationSelected\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _pidSelected\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_pidSelected", "pidSelected", 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.hasPidSelected())\r
-                    return null;\r
-                return (target.getPidSelected() ? 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.deletePidSelected();\r
-                        return;\r
-                    }\r
-                    target.setPidSelected( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _pidSelected\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _bgColour\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_bgColour", "bgColour", 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
-                Viewport target = (Viewport) object;\r
-                return target.getBgColour();\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
-                    target.setBgColour( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _bgColour\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _consThreshold\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_consThreshold", "consThreshold", 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.hasConsThreshold())\r
-                    return null;\r
-                return new java.lang.Integer(target.getConsThreshold());\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.deleteConsThreshold();\r
-                        return;\r
-                    }\r
-                    target.setConsThreshold( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _consThreshold\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _pidThreshold\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_pidThreshold", "pidThreshold", 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.hasPidThreshold())\r
-                    return null;\r
-                return new java.lang.Integer(target.getPidThreshold());\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.deletePidThreshold();\r
-                        return;\r
-                    }\r
-                    target.setPidThreshold( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _pidThreshold\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _title\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_title", "title", 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
-                Viewport target = (Viewport) object;\r
-                return target.getTitle();\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
-                    target.setTitle( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _title\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _showFullId\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showFullId", "showFullId", 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.hasShowFullId())\r
-                    return null;\r
-                return (target.getShowFullId() ? 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.deleteShowFullId();\r
-                        return;\r
-                    }\r
-                    target.setShowFullId( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _showFullId\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _rightAlignIds\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_rightAlignIds", "rightAlignIds", 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.hasRightAlignIds())\r
-                    return null;\r
-                return (target.getRightAlignIds() ? 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.deleteRightAlignIds();\r
-                        return;\r
-                    }\r
-                    target.setRightAlignIds( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _rightAlignIds\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _showText\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showText", "showText", 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.hasShowText())\r
-                    return null;\r
-                return (target.getShowText() ? 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.deleteShowText();\r
-                        return;\r
-                    }\r
-                    target.setShowText( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _showText\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _showColourText\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showColourText", "showColourText", 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.hasShowColourText())\r
-                    return null;\r
-                return (target.getShowColourText() ? 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.deleteShowColourText();\r
-                        return;\r
-                    }\r
-                    target.setShowColourText( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _showColourText\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _showBoxes\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showBoxes", "showBoxes", 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.hasShowBoxes())\r
-                    return null;\r
-                return (target.getShowBoxes() ? 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.deleteShowBoxes();\r
-                        return;\r
-                    }\r
-                    target.setShowBoxes( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _showBoxes\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _wrapAlignment\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_wrapAlignment", "wrapAlignment", 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.hasWrapAlignment())\r
-                    return null;\r
-                return (target.getWrapAlignment() ? 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.deleteWrapAlignment();\r
-                        return;\r
-                    }\r
-                    target.setWrapAlignment( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _wrapAlignment\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _renderGaps\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_renderGaps", "renderGaps", 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.hasRenderGaps())\r
-                    return null;\r
-                return (target.getRenderGaps() ? 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.deleteRenderGaps();\r
-                        return;\r
-                    }\r
-                    target.setRenderGaps( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _renderGaps\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _showSequenceFeatures\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_showSequenceFeatures", "showSequenceFeatures", 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.hasShowSequenceFeatures())\r
-                    return null;\r
-                return (target.getShowSequenceFeatures() ? 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.deleteShowSequenceFeatures();\r
-                        return;\r
-                    }\r
-                    target.setShowSequenceFeatures( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _showSequenceFeatures\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new 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
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                Viewport target = (Viewport) object;\r
-                if(!target.hasShowAnnotation())\r
-                    return null;\r
-                return (target.getShowAnnotation() ? 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.deleteShowAnnotation();\r
-                        return;\r
-                    }\r
-                    target.setShowAnnotation( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _showAnnotation\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new 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
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                Viewport target = (Viewport) object;\r
-                if(!target.hasXpos())\r
-                    return null;\r
-                return new java.lang.Integer(target.getXpos());\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.deleteXpos();\r
-                        return;\r
-                    }\r
-                    target.setXpos( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _xpos\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _ypos\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_ypos", "ypos", 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.hasYpos())\r
-                    return null;\r
-                return new java.lang.Integer(target.getYpos());\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.deleteYpos();\r
-                        return;\r
-                    }\r
-                    target.setYpos( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _ypos\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _width\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_width", "width", 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.hasWidth())\r
-                    return null;\r
-                return new java.lang.Integer(target.getWidth());\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.deleteWidth();\r
-                        return;\r
-                    }\r
-                    target.setWidth( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _width\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _height\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_height", "height", 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.hasHeight())\r
-                    return null;\r
-                return new java.lang.Integer(target.getHeight());\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.deleteHeight();\r
-                        return;\r
-                    }\r
-                    target.setHeight( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _height\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _startRes\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_startRes", "startRes", 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.hasStartRes())\r
-                    return null;\r
-                return new java.lang.Integer(target.getStartRes());\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.deleteStartRes();\r
-                        return;\r
-                    }\r
-                    target.setStartRes( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _startRes\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _startSeq\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_startSeq", "startSeq", 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.hasStartSeq())\r
-                    return null;\r
-                return new java.lang.Integer(target.getStartSeq());\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.deleteStartSeq();\r
-                        return;\r
-                    }\r
-                    target.setStartSeq( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _startSeq\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _fontName\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_fontName", "fontName", 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
-                Viewport target = (Viewport) object;\r
-                return target.getFontName();\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
-                    target.setFontName( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _fontName\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _fontSize\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_fontSize", "fontSize", 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.hasFontSize())\r
-                    return null;\r
-                return new java.lang.Integer(target.getFontSize());\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.deleteFontSize();\r
-                        return;\r
-                    }\r
-                    target.setFontSize( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _fontSize\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _fontStyle\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_fontStyle", "fontStyle", 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.hasFontStyle())\r
-                    return null;\r
-                return new java.lang.Integer(target.getFontStyle());\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.deleteFontStyle();\r
-                        return;\r
-                    }\r
-                    target.setFontStyle( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _fontStyle\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _viewName\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_viewName", "viewName", 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
-                Viewport target = (Viewport) object;\r
-                return target.getViewName();\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
-                    target.setViewName( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _viewName\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _sequenceSetId\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_sequenceSetId", "sequenceSetId", 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
-                Viewport target = (Viewport) object;\r
-                return target.getSequenceSetId();\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
-                    target.setSequenceSetId( (java.lang.String) value);\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _sequenceSetId\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _gatheredViews\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_gatheredViews", "gatheredViews", 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.hasGatheredViews())\r
-                    return null;\r
-                return (target.getGatheredViews() ? 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.deleteGatheredViews();\r
-                        return;\r
-                    }\r
-                    target.setGatheredViews( ((java.lang.Boolean)value).booleanValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _gatheredViews\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            BooleanValidator typeValidator = new BooleanValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _textCol1\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textCol1", "textCol1", 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.hasTextCol1())\r
-                    return null;\r
-                return new java.lang.Integer(target.getTextCol1());\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.deleteTextCol1();\r
-                        return;\r
-                    }\r
-                    target.setTextCol1( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _textCol1\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _textCol2\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textCol2", "textCol2", 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.hasTextCol2())\r
-                    return null;\r
-                return new java.lang.Integer(target.getTextCol2());\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.deleteTextCol2();\r
-                        return;\r
-                    }\r
-                    target.setTextCol2( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _textCol2\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _textColThreshold\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_textColThreshold", "textColThreshold", 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.hasTextColThreshold())\r
-                    return null;\r
-                return new java.lang.Integer(target.getTextColThreshold());\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.deleteTextColThreshold();\r
-                        return;\r
-                    }\r
-                    target.setTextColThreshold( ((java.lang.Integer)value).intValue());\r
-                }\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
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _textColThreshold\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-            IntegerValidator typeValidator= new IntegerValidator();\r
-            fieldValidator.setValidator(typeValidator);\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-        //-- _annotationColours\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.AnnotationColours.class, "_annotationColours", "AnnotationColours", org.exolab.castor.xml.NodeType.Element);\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
-                return target.getAnnotationColours();\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
-                    target.setAnnotationColours( (jalview.schemabinding.version2.AnnotationColours) value);\r
-                }\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 new jalview.schemabinding.version2.AnnotationColours();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _annotationColours\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _hiddenColumnsList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(jalview.schemabinding.version2.HiddenColumns.class, "_hiddenColumnsList", "hiddenColumns", org.exolab.castor.xml.NodeType.Element);\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
-                return target.getHiddenColumns();\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
-                    target.addHiddenColumns( (jalview.schemabinding.version2.HiddenColumns) value);\r
-                }\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 new jalview.schemabinding.version2.HiddenColumns();\r
-            }\r
-        } );\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("www.jalview.org");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _hiddenColumnsList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- jalview.schemabinding.version2.ViewportDescriptor()\r
-\r
-\r
-      //-----------/\r
-     //- Methods -/\r
-    //-----------/\r
-\r
-    /**\r
-     * Method getAccessMode\r
-     * \r
-     * \r
-     * \r
-     * @return AccessMode\r
-     */\r
-    public org.exolab.castor.mapping.AccessMode getAccessMode()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() \r
-\r
-    /**\r
-     * Method getExtends\r
-     * \r
-     * \r
-     * \r
-     * @return ClassDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.ClassDescriptor getExtends()\r
-    {\r
-        return null;\r
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() \r
-\r
-    /**\r
-     * Method getIdentity\r
-     * \r
-     * \r
-     * \r
-     * @return FieldDescriptor\r
-     */\r
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()\r
-    {\r
-        return identity;\r
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() \r
-\r
-    /**\r
-     * Method getJavaClass\r
-     * \r
-     * \r
-     * \r
-     * @return Class\r
-     */\r
-    public java.lang.Class getJavaClass()\r
-    {\r
-        return jalview.schemabinding.version2.Viewport.class;\r
-    } //-- java.lang.Class getJavaClass() \r
-\r
-    /**\r
-     * Method getNameSpacePrefix\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpacePrefix()\r
-    {\r
-        return nsPrefix;\r
-    } //-- java.lang.String getNameSpacePrefix() \r
-\r
-    /**\r
-     * Method getNameSpaceURI\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getNameSpaceURI()\r
-    {\r
-        return nsURI;\r
-    } //-- java.lang.String getNameSpaceURI() \r
-\r
-    /**\r
-     * Method getValidator\r
-     * \r
-     * \r
-     * \r
-     * @return TypeValidator\r
-     */\r
-    public org.exolab.castor.xml.TypeValidator getValidator()\r
-    {\r
-        return this;\r
-    } //-- org.exolab.castor.xml.TypeValidator getValidator() \r
-\r
-    /**\r
-     * Method getXMLName\r
-     * \r
-     * \r
-     * \r
-     * @return String\r
-     */\r
-    public java.lang.String getXMLName()\r
-    {\r
-        return xmlName;\r
-    } //-- java.lang.String getXMLName() \r
-\r
-}\r