Descriptors live in uk.ac.vamsas.objects.core.descriptors in castor-1.1 xml binding.
authorjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 24 Apr 2007 16:37:54 +0000 (16:37 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 24 Apr 2007 16:37:54 +0000 (16:37 +0000)
git-svn-id: https://svn.lifesci.dundee.ac.uk/svn/repository/trunk@387 be28352e-c001-0410-b1a7-c7978e42abec

36 files changed:
src/uk/ac/vamsas/objects/core/AlignmentAnnotationDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/AlignmentDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/AlignmentSequenceAnnotationDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/AlignmentSequenceDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/AnnotationElementDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/AppDataDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/ApplicationDataDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/AttachmentDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/CommonDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/DataSetAnnotationsDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/DataSetDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/DbRefDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/EntryDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/GlyphDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/InputDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/InstanceDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/LinkDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/LockFileDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/MapDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/MapListDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/MappingDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/NewickDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/ParamDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/PosDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/PropertyDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/ProvenanceDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/RangeAnnotationDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/RangeTypeDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/ScoreDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/SegDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/SequenceDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/SequenceTypeDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/TreeDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/UserDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/VAMSASDescriptor.java [deleted file]
src/uk/ac/vamsas/objects/core/VamsasDocumentDescriptor.java [deleted file]

diff --git a/src/uk/ac/vamsas/objects/core/AlignmentAnnotationDescriptor.java b/src/uk/ac/vamsas/objects/core/AlignmentAnnotationDescriptor.java
deleted file mode 100644 (file)
index 7bdd015..0000000
+++ /dev/null
@@ -1,255 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 AlignmentAnnotationDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class AlignmentAnnotationDescriptor extends uk.ac.vamsas.objects.core.RangeAnnotationDescriptor {\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 AlignmentAnnotationDescriptor() \r
-     {\r
-        super();\r
-        setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.RangeAnnotationDescriptor());\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "AlignmentAnnotation";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             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
-                AlignmentAnnotation target = (AlignmentAnnotation) 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
-                    AlignmentAnnotation target = (AlignmentAnnotation) 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
-        desc.setMultivalued(false);\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
-        //-- initialize element descriptors\r
-        \r
-        //-- _provenance\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Provenance.class, "_provenance", "Provenance", 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
-                AlignmentAnnotation target = (AlignmentAnnotation) object;\r
-                return target.getProvenance();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AlignmentAnnotation target = (AlignmentAnnotation) object;\r
-                    target.setProvenance( (uk.ac.vamsas.objects.core.Provenance) 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 uk.ac.vamsas.objects.core.Provenance();\r
-            }\r
-        };\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _provenance\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- uk.ac.vamsas.objects.core.AlignmentAnnotationDescriptor()\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 uk.ac.vamsas.objects.core.AlignmentAnnotation.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/uk/ac/vamsas/objects/core/AlignmentDescriptor.java b/src/uk/ac/vamsas/objects/core/AlignmentDescriptor.java
deleted file mode 100644 (file)
index a24de0d..0000000
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 AlignmentDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class AlignmentDescriptor 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 AlignmentDescriptor() 
-     {
-        super();
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";
-        xmlName = "Alignment";
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _gapChar
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_gapChar", "gapChar", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Alignment target = (Alignment) object;
-                return target.getGapChar();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Alignment target = (Alignment) object;
-                    target.setGapChar( (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);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _gapChar
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _aligned
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_aligned", "aligned", org.exolab.castor.xml.NodeType.Attribute);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Alignment target = (Alignment) object;
-                if(!target.hasAligned())
-                    return null;
-                return (target.getAligned() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Alignment target = (Alignment) object;
-                    // if null, use delete method for optional primitives 
-                    if (value == null) {
-                        target.deleteAligned();
-                        return;
-                    }
-                    target.setAligned( ((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);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _aligned
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            BooleanValidator typeValidator = new BooleanValidator();
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _id
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_id", "id", org.exolab.castor.xml.NodeType.Attribute);
-        this.identity = desc;
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Alignment target = (Alignment) object;
-                return target.getId();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Alignment target = (Alignment) object;
-                    target.setId( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new java.lang.String();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _id
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _modifiable
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_modifiable", "modifiable", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Alignment target = (Alignment) object;
-                return target.getModifiable();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Alignment target = (Alignment) object;
-                    target.setModifiable( (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);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _modifiable
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _alignmentAnnotationList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.AlignmentAnnotation.class, "_alignmentAnnotationList", "AlignmentAnnotation", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Alignment target = (Alignment) object;
-                return target.getAlignmentAnnotation();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Alignment target = (Alignment) object;
-                    target.addAlignmentAnnotation( (uk.ac.vamsas.objects.core.AlignmentAnnotation) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.AlignmentAnnotation();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _alignmentAnnotationList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _treeList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Tree.class, "_treeList", "Tree", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Alignment target = (Alignment) object;
-                return target.getTree();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Alignment target = (Alignment) object;
-                    target.addTree( (uk.ac.vamsas.objects.core.Tree) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Tree();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _treeList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _alignmentSequenceList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.AlignmentSequence.class, "_alignmentSequenceList", "alignmentSequence", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Alignment target = (Alignment) object;
-                return target.getAlignmentSequence();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Alignment target = (Alignment) object;
-                    target.addAlignmentSequence( (uk.ac.vamsas.objects.core.AlignmentSequence) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.AlignmentSequence();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setRequired(true);
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _alignmentSequenceList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _propertyList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Property.class, "_propertyList", "property", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Alignment target = (Alignment) object;
-                return target.getProperty();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Alignment target = (Alignment) object;
-                    target.addProperty( (uk.ac.vamsas.objects.core.Property) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Property();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _propertyList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _provenance
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Provenance.class, "_provenance", "Provenance", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Alignment target = (Alignment) object;
-                return target.getProvenance();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Alignment target = (Alignment) object;
-                    target.setProvenance( (uk.ac.vamsas.objects.core.Provenance) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Provenance();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _provenance
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- uk.ac.vamsas.objects.core.AlignmentDescriptor()
-
-
-      //-----------/
-     //- 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 uk.ac.vamsas.objects.core.Alignment.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/uk/ac/vamsas/objects/core/AlignmentSequenceAnnotationDescriptor.java b/src/uk/ac/vamsas/objects/core/AlignmentSequenceAnnotationDescriptor.java
deleted file mode 100644 (file)
index ea94403..0000000
+++ /dev/null
@@ -1,255 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 AlignmentSequenceAnnotationDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class AlignmentSequenceAnnotationDescriptor extends uk.ac.vamsas.objects.core.RangeAnnotationDescriptor {\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 AlignmentSequenceAnnotationDescriptor() \r
-     {\r
-        super();\r
-        setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.RangeAnnotationDescriptor());\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "AlignmentSequenceAnnotation";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             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
-                AlignmentSequenceAnnotation target = (AlignmentSequenceAnnotation) 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
-                    AlignmentSequenceAnnotation target = (AlignmentSequenceAnnotation) 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
-        desc.setMultivalued(false);\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
-        //-- initialize element descriptors\r
-        \r
-        //-- _provenance\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Provenance.class, "_provenance", "Provenance", 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
-                AlignmentSequenceAnnotation target = (AlignmentSequenceAnnotation) object;\r
-                return target.getProvenance();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AlignmentSequenceAnnotation target = (AlignmentSequenceAnnotation) object;\r
-                    target.setProvenance( (uk.ac.vamsas.objects.core.Provenance) 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 uk.ac.vamsas.objects.core.Provenance();\r
-            }\r
-        };\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _provenance\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- uk.ac.vamsas.objects.core.AlignmentSequenceAnnotationDescriptor()\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 uk.ac.vamsas.objects.core.AlignmentSequenceAnnotation.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/uk/ac/vamsas/objects/core/AlignmentSequenceDescriptor.java b/src/uk/ac/vamsas/objects/core/AlignmentSequenceDescriptor.java
deleted file mode 100644 (file)
index 0bbc06b..0000000
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 AlignmentSequenceDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class AlignmentSequenceDescriptor extends uk.ac.vamsas.objects.core.SequenceTypeDescriptor {
-
-
-      //--------------------------/
-     //- 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 AlignmentSequenceDescriptor() 
-     {
-        super();
-        setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.SequenceTypeDescriptor());
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";
-        xmlName = "alignmentSequence";
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _id
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_id", "id", org.exolab.castor.xml.NodeType.Attribute);
-        this.identity = desc;
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                AlignmentSequence target = (AlignmentSequence) object;
-                return target.getId();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    AlignmentSequence target = (AlignmentSequence) object;
-                    target.setId( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new java.lang.String();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _id
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _refid
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Object.class, "_refid", "refid", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setReference(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                AlignmentSequence target = (AlignmentSequence) object;
-                return target.getRefid();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    AlignmentSequence target = (AlignmentSequence) object;
-                    target.setRefid( (java.lang.Object) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new java.lang.Object();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _refid
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _alignmentSequenceAnnotationList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.AlignmentSequenceAnnotation.class, "_alignmentSequenceAnnotationList", "AlignmentSequenceAnnotation", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                AlignmentSequence target = (AlignmentSequence) object;
-                return target.getAlignmentSequenceAnnotation();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    AlignmentSequence target = (AlignmentSequence) object;
-                    target.addAlignmentSequenceAnnotation( (uk.ac.vamsas.objects.core.AlignmentSequenceAnnotation) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.AlignmentSequenceAnnotation();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _alignmentSequenceAnnotationList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- uk.ac.vamsas.objects.core.AlignmentSequenceDescriptor()
-
-
-      //-----------/
-     //- 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 super.getExtends();
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        if (identity == null)
-            return super.getIdentity();
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return uk.ac.vamsas.objects.core.AlignmentSequence.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/uk/ac/vamsas/objects/core/AnnotationElementDescriptor.java b/src/uk/ac/vamsas/objects/core/AnnotationElementDescriptor.java
deleted file mode 100644 (file)
index 4d315ed..0000000
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 AnnotationElementDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class AnnotationElementDescriptor 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 AnnotationElementDescriptor() 
-     {
-        super();
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";
-        xmlName = "annotationElement";
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _position
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_position", "position", org.exolab.castor.xml.NodeType.Attribute);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                AnnotationElement target = (AnnotationElement) object;
-                if(!target.hasPosition())
-                    return null;
-                return new java.lang.Integer(target.getPosition());
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    AnnotationElement target = (AnnotationElement) object;
-                    // ignore null values for non optional primitives
-                    if (value == null) return;
-                    
-                    target.setPosition( ((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);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _position
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            IntegerValidator typeValidator = new IntegerValidator();
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _after
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_after", "after", org.exolab.castor.xml.NodeType.Attribute);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                AnnotationElement target = (AnnotationElement) object;
-                if(!target.hasAfter())
-                    return null;
-                return (target.getAfter() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE);
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    AnnotationElement target = (AnnotationElement) object;
-                    // if null, use delete method for optional primitives 
-                    if (value == null) {
-                        target.deleteAfter();
-                        return;
-                    }
-                    target.setAfter( ((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);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _after
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            BooleanValidator typeValidator = new BooleanValidator();
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _id
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_id", "id", org.exolab.castor.xml.NodeType.Attribute);
-        this.identity = desc;
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                AnnotationElement target = (AnnotationElement) object;
-                return target.getId();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    AnnotationElement target = (AnnotationElement) object;
-                    target.setId( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new java.lang.String();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _id
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _description
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_description", "description", org.exolab.castor.xml.NodeType.Element);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                AnnotationElement target = (AnnotationElement) object;
-                return target.getDescription();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    AnnotationElement target = (AnnotationElement) object;
-                    target.setDescription( (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);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _description
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _glyphList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Glyph.class, "_glyphList", "glyph", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                AnnotationElement target = (AnnotationElement) object;
-                return target.getGlyph();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    AnnotationElement target = (AnnotationElement) object;
-                    target.addGlyph( (uk.ac.vamsas.objects.core.Glyph) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Glyph();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _glyphList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _valueList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(float.class, "_valueList", "value", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                AnnotationElement target = (AnnotationElement) object;
-                return target.getValue();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    AnnotationElement target = (AnnotationElement) object;
-                    // ignore null values for non optional primitives
-                    if (value == null) return;
-                    
-                    target.addValue( ((java.lang.Float)value).floatValue());
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _valueList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-            FloatValidator typeValidator = new FloatValidator();
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-    } //-- uk.ac.vamsas.objects.core.AnnotationElementDescriptor()
-
-
-      //-----------/
-     //- 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 uk.ac.vamsas.objects.core.AnnotationElement.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/uk/ac/vamsas/objects/core/AppDataDescriptor.java b/src/uk/ac/vamsas/objects/core/AppDataDescriptor.java
deleted file mode 100644 (file)
index 3366ccd..0000000
+++ /dev/null
@@ -1,250 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 AppDataDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class AppDataDescriptor 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 AppDataDescriptor() \r
-     {\r
-        super();\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "appData";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsChoice();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- initialize element descriptors\r
-        \r
-        //-- _data\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(byte[].class, "_data", "data", 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
-                AppData target = (AppData) object;\r
-                return target.getData();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AppData target = (AppData) object;\r
-                    target.setData( (byte[]) 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("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _data\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _dataReference\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_dataReference", "dataReference", 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
-                AppData target = (AppData) object;\r
-                return target.getDataReference();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    AppData target = (AppData) object;\r
-                    target.setDataReference( (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("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _dataReference\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
-    } //-- uk.ac.vamsas.objects.core.AppDataDescriptor()\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 uk.ac.vamsas.objects.core.AppData.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/uk/ac/vamsas/objects/core/ApplicationDataDescriptor.java b/src/uk/ac/vamsas/objects/core/ApplicationDataDescriptor.java
deleted file mode 100644 (file)
index 8998b5a..0000000
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 ApplicationDataDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class ApplicationDataDescriptor extends uk.ac.vamsas.objects.core.AppDataDescriptor {
-
-
-      //--------------------------/
-     //- 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 ApplicationDataDescriptor() 
-     {
-        super();
-        setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.AppDataDescriptor());
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";
-        xmlName = "ApplicationData";
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _version
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_version", "version", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                ApplicationData target = (ApplicationData) object;
-                return target.getVersion();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    ApplicationData target = (ApplicationData) object;
-                    target.setVersion( (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);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _version
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _name
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                ApplicationData target = (ApplicationData) object;
-                return target.getName();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    ApplicationData target = (ApplicationData) object;
-                    target.setName( (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);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _name
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _userList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.User.class, "_userList", "User", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                ApplicationData target = (ApplicationData) object;
-                return target.getUser();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    ApplicationData target = (ApplicationData) object;
-                    target.addUser( (uk.ac.vamsas.objects.core.User) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.User();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _userList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _common
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Common.class, "_common", "Common", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                ApplicationData target = (ApplicationData) object;
-                return target.getCommon();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    ApplicationData target = (ApplicationData) object;
-                    target.setCommon( (uk.ac.vamsas.objects.core.Common) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Common();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _common
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _instanceList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Instance.class, "_instanceList", "Instance", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                ApplicationData target = (ApplicationData) object;
-                return target.getInstance();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    ApplicationData target = (ApplicationData) object;
-                    target.addInstance( (uk.ac.vamsas.objects.core.Instance) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Instance();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _instanceList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- uk.ac.vamsas.objects.core.ApplicationDataDescriptor()
-
-
-      //-----------/
-     //- 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 super.getExtends();
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        if (identity == null)
-            return super.getIdentity();
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return uk.ac.vamsas.objects.core.ApplicationData.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/uk/ac/vamsas/objects/core/AttachmentDescriptor.java b/src/uk/ac/vamsas/objects/core/AttachmentDescriptor.java
deleted file mode 100644 (file)
index 5c6712d..0000000
+++ /dev/null
@@ -1,325 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 AttachmentDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class AttachmentDescriptor extends uk.ac.vamsas.objects.core.AppDataDescriptor {\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 AttachmentDescriptor() \r
-     {\r
-        super();\r
-        setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.AppDataDescriptor());\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "Attachment";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _compressed\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_compressed", "compressed", 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
-                Attachment target = (Attachment) object;\r
-                if(!target.hasCompressed())\r
-                    return null;\r
-                return (target.getCompressed() ? 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
-                    Attachment target = (Attachment) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteCompressed();\r
-                        return;\r
-                    }\r
-                    target.setCompressed( ((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.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _compressed\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
-        //-- _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
-                Attachment target = (Attachment) 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
-                    Attachment target = (Attachment) 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
-        desc.setMultivalued(false);\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
-        //-- _objectref\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Object.class, "_objectref", "objectref", org.exolab.castor.xml.NodeType.Attribute);\r
-        desc.setReference(true);\r
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                Attachment target = (Attachment) object;\r
-                return target.getObjectref();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Attachment target = (Attachment) object;\r
-                    target.setObjectref( (java.lang.Object) 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.lang.Object();\r
-            }\r
-        };\r
-        desc.setHandler(handler);\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _objectref\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\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
-        this.identity = desc;\r
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                Attachment target = (Attachment) 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
-                    Attachment target = (Attachment) 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 new java.lang.String();\r
-            }\r
-        };\r
-        desc.setHandler(handler);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _id\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-    } //-- uk.ac.vamsas.objects.core.AttachmentDescriptor()\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 uk.ac.vamsas.objects.core.Attachment.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/uk/ac/vamsas/objects/core/CommonDescriptor.java b/src/uk/ac/vamsas/objects/core/CommonDescriptor.java
deleted file mode 100644 (file)
index 6672b14..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 CommonDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class CommonDescriptor extends uk.ac.vamsas.objects.core.AppDataDescriptor {\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 CommonDescriptor() \r
-     {\r
-        super();\r
-        setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.AppDataDescriptor());\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "Common";\r
-    } //-- uk.ac.vamsas.objects.core.CommonDescriptor()\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 uk.ac.vamsas.objects.core.Common.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/uk/ac/vamsas/objects/core/DataSetAnnotationsDescriptor.java b/src/uk/ac/vamsas/objects/core/DataSetAnnotationsDescriptor.java
deleted file mode 100644 (file)
index fae04cf..0000000
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 DataSetAnnotationsDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class DataSetAnnotationsDescriptor extends uk.ac.vamsas.objects.core.RangeAnnotationDescriptor {
-
-
-      //--------------------------/
-     //- 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 DataSetAnnotationsDescriptor() 
-     {
-        super();
-        setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.RangeAnnotationDescriptor());
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";
-        xmlName = "DataSetAnnotations";
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _seqRef
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Object.class, "_seqRef", "seqRef", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setReference(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DataSetAnnotations target = (DataSetAnnotations) object;
-                return target.getSeqRef();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DataSetAnnotations target = (DataSetAnnotations) object;
-                    target.setSeqRef( (java.lang.Object) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new java.lang.Object();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _seqRef
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _provenance
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Provenance.class, "_provenance", "Provenance", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DataSetAnnotations target = (DataSetAnnotations) object;
-                return target.getProvenance();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DataSetAnnotations target = (DataSetAnnotations) object;
-                    target.setProvenance( (uk.ac.vamsas.objects.core.Provenance) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Provenance();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _provenance
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- uk.ac.vamsas.objects.core.DataSetAnnotationsDescriptor()
-
-
-      //-----------/
-     //- 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 super.getExtends();
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        if (identity == null)
-            return super.getIdentity();
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return uk.ac.vamsas.objects.core.DataSetAnnotations.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/uk/ac/vamsas/objects/core/DataSetDescriptor.java b/src/uk/ac/vamsas/objects/core/DataSetDescriptor.java
deleted file mode 100644 (file)
index d5c42fe..0000000
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 DataSetDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class DataSetDescriptor 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 DataSetDescriptor() 
-     {
-        super();
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";
-        xmlName = "DataSet";
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _id
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_id", "id", org.exolab.castor.xml.NodeType.Attribute);
-        this.identity = desc;
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DataSet target = (DataSet) object;
-                return target.getId();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DataSet target = (DataSet) object;
-                    target.setId( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new java.lang.String();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _id
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _sequenceList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Sequence.class, "_sequenceList", "Sequence", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DataSet target = (DataSet) object;
-                return target.getSequence();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DataSet target = (DataSet) object;
-                    target.addSequence( (uk.ac.vamsas.objects.core.Sequence) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Sequence();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setRequired(true);
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _sequenceList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _dataSetAnnotationsList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.DataSetAnnotations.class, "_dataSetAnnotationsList", "DataSetAnnotations", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DataSet target = (DataSet) object;
-                return target.getDataSetAnnotations();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DataSet target = (DataSet) object;
-                    target.addDataSetAnnotations( (uk.ac.vamsas.objects.core.DataSetAnnotations) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.DataSetAnnotations();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _dataSetAnnotationsList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _alignmentList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Alignment.class, "_alignmentList", "Alignment", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DataSet target = (DataSet) object;
-                return target.getAlignment();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DataSet target = (DataSet) object;
-                    target.addAlignment( (uk.ac.vamsas.objects.core.Alignment) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Alignment();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _alignmentList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _treeList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Tree.class, "_treeList", "Tree", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DataSet target = (DataSet) object;
-                return target.getTree();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DataSet target = (DataSet) object;
-                    target.addTree( (uk.ac.vamsas.objects.core.Tree) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Tree();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _treeList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _provenance
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Provenance.class, "_provenance", "Provenance", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DataSet target = (DataSet) object;
-                return target.getProvenance();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DataSet target = (DataSet) object;
-                    target.setProvenance( (uk.ac.vamsas.objects.core.Provenance) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Provenance();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _provenance
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- uk.ac.vamsas.objects.core.DataSetDescriptor()
-
-
-      //-----------/
-     //- 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 uk.ac.vamsas.objects.core.DataSet.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/uk/ac/vamsas/objects/core/DbRefDescriptor.java b/src/uk/ac/vamsas/objects/core/DbRefDescriptor.java
deleted file mode 100644 (file)
index e6e9374..0000000
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 DbRefDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class DbRefDescriptor 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 DbRefDescriptor() 
-     {
-        super();
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";
-        xmlName = "dbRef";
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _source
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_source", "source", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DbRef target = (DbRef) object;
-                return target.getSource();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DbRef target = (DbRef) object;
-                    target.setSource( (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);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _source
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _version
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_version", "version", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DbRef target = (DbRef) object;
-                return target.getVersion();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DbRef target = (DbRef) object;
-                    target.setVersion( (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);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _version
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _accessionId
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_accessionId", "accessionId", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DbRef target = (DbRef) object;
-                return target.getAccessionId();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DbRef target = (DbRef) object;
-                    target.setAccessionId( (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);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _accessionId
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _id
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_id", "id", org.exolab.castor.xml.NodeType.Attribute);
-        this.identity = desc;
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DbRef target = (DbRef) object;
-                return target.getId();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DbRef target = (DbRef) object;
-                    target.setId( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new java.lang.String();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _id
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _mapList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Map.class, "_mapList", "map", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DbRef target = (DbRef) object;
-                return target.getMap();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DbRef target = (DbRef) object;
-                    target.addMap( (uk.ac.vamsas.objects.core.Map) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Map();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _mapList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _linkList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Link.class, "_linkList", "link", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DbRef target = (DbRef) object;
-                return target.getLink();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DbRef target = (DbRef) object;
-                    target.addLink( (uk.ac.vamsas.objects.core.Link) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Link();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _linkList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _propertyList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Property.class, "_propertyList", "property", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                DbRef target = (DbRef) object;
-                return target.getProperty();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    DbRef target = (DbRef) object;
-                    target.addProperty( (uk.ac.vamsas.objects.core.Property) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Property();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _propertyList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- uk.ac.vamsas.objects.core.DbRefDescriptor()
-
-
-      //-----------/
-     //- 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 uk.ac.vamsas.objects.core.DbRef.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/uk/ac/vamsas/objects/core/EntryDescriptor.java b/src/uk/ac/vamsas/objects/core/EntryDescriptor.java
deleted file mode 100644 (file)
index c9f8635..0000000
+++ /dev/null
@@ -1,471 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 EntryDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class EntryDescriptor 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 EntryDescriptor() 
-     {
-        super();
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";
-        xmlName = "entry";
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _id
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_id", "id", org.exolab.castor.xml.NodeType.Attribute);
-        this.identity = desc;
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Entry target = (Entry) object;
-                return target.getId();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Entry target = (Entry) object;
-                    target.setId( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new java.lang.String();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _id
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _user
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_user", "User", org.exolab.castor.xml.NodeType.Element);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Entry target = (Entry) object;
-                return target.getUser();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Entry target = (Entry) object;
-                    target.setUser( (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);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _user
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _app
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_app", "App", org.exolab.castor.xml.NodeType.Element);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Entry target = (Entry) object;
-                return target.getApp();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Entry target = (Entry) object;
-                    target.setApp( (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);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _app
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _action
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_action", "Action", org.exolab.castor.xml.NodeType.Element);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Entry target = (Entry) object;
-                return target.getAction();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Entry target = (Entry) object;
-                    target.setAction( (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);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _action
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _date
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.types.Date.class, "_date", "Date", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Entry target = (Entry) object;
-                return target.getDate();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Entry target = (Entry) object;
-                    target.setDate( (org.exolab.castor.types.Date) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new org.exolab.castor.types.Date();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _date
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            DateTimeValidator typeValidator = new DateTimeValidator();
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _propertyList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Property.class, "_propertyList", "property", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Entry target = (Entry) object;
-                return target.getProperty();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Entry target = (Entry) object;
-                    target.addProperty( (uk.ac.vamsas.objects.core.Property) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Property();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _propertyList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _paramList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Param.class, "_paramList", "param", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Entry target = (Entry) object;
-                return target.getParam();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Entry target = (Entry) object;
-                    target.addParam( (uk.ac.vamsas.objects.core.Param) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Param();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _paramList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _inputList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Input.class, "_inputList", "input", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Entry target = (Entry) object;
-                return target.getInput();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Entry target = (Entry) object;
-                    target.addInput( (uk.ac.vamsas.objects.core.Input) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Input();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _inputList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- uk.ac.vamsas.objects.core.EntryDescriptor()
-
-
-      //-----------/
-     //- 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 uk.ac.vamsas.objects.core.Entry.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/uk/ac/vamsas/objects/core/GlyphDescriptor.java b/src/uk/ac/vamsas/objects/core/GlyphDescriptor.java
deleted file mode 100644 (file)
index 726dec2..0000000
+++ /dev/null
@@ -1,244 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 GlyphDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class GlyphDescriptor 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 GlyphDescriptor() \r
-     {\r
-        super();\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "glyph";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- _content\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_content", "PCDATA", org.exolab.castor.xml.NodeType.Text);\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
-                Glyph target = (Glyph) object;\r
-                return target.getContent();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Glyph target = (Glyph) object;\r
-                    target.setContent( (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: _content\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 attribute descriptors\r
-        \r
-        //-- _dict\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_dict", "dict", 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
-                Glyph target = (Glyph) object;\r
-                return target.getDict();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Glyph target = (Glyph) object;\r
-                    target.setDict( (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.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _dict\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
-    } //-- uk.ac.vamsas.objects.core.GlyphDescriptor()\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 uk.ac.vamsas.objects.core.Glyph.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/uk/ac/vamsas/objects/core/InputDescriptor.java b/src/uk/ac/vamsas/objects/core/InputDescriptor.java
deleted file mode 100644 (file)
index 5fdd3f8..0000000
+++ /dev/null
@@ -1,247 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 InputDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class InputDescriptor extends uk.ac.vamsas.objects.core.RangeTypeDescriptor {\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 InputDescriptor() \r
-     {\r
-        super();\r
-        setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.RangeTypeDescriptor());\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "input";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             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
-                Input target = (Input) 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
-                    Input target = (Input) 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
-        desc.setMultivalued(false);\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
-        //-- _objRef\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Object.class, "_objRef", "objRef", org.exolab.castor.xml.NodeType.Attribute);\r
-        desc.setReference(true);\r
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                Input target = (Input) object;\r
-                return target.getObjRef();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Input target = (Input) object;\r
-                    target.setObjRef( (java.lang.Object) 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.lang.Object();\r
-            }\r
-        };\r
-        desc.setHandler(handler);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _objRef\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-    } //-- uk.ac.vamsas.objects.core.InputDescriptor()\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 uk.ac.vamsas.objects.core.Input.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/uk/ac/vamsas/objects/core/InstanceDescriptor.java b/src/uk/ac/vamsas/objects/core/InstanceDescriptor.java
deleted file mode 100644 (file)
index 3e2bc73..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 InstanceDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class InstanceDescriptor extends uk.ac.vamsas.objects.core.AppDataDescriptor {\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 InstanceDescriptor() \r
-     {\r
-        super();\r
-        setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.AppDataDescriptor());\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "Instance";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _urn\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_urn", "urn", 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
-                Instance target = (Instance) object;\r
-                return target.getUrn();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Instance target = (Instance) object;\r
-                    target.setUrn( (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
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _urn\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
-    } //-- uk.ac.vamsas.objects.core.InstanceDescriptor()\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 uk.ac.vamsas.objects.core.Instance.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/uk/ac/vamsas/objects/core/LinkDescriptor.java b/src/uk/ac/vamsas/objects/core/LinkDescriptor.java
deleted file mode 100644 (file)
index d10e937..0000000
+++ /dev/null
@@ -1,240 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 LinkDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class LinkDescriptor 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 LinkDescriptor() \r
-     {\r
-        super();\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "link";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- _content\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_content", "PCDATA", org.exolab.castor.xml.NodeType.Text);\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
-                Link target = (Link) object;\r
-                return target.getContent();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Link target = (Link) object;\r
-                    target.setContent( (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: _content\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 attribute descriptors\r
-        \r
-        //-- _href\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_href", "href", 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
-                Link target = (Link) object;\r
-                return target.getHref();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Link target = (Link) object;\r
-                    target.setHref( (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 new java.lang.String();\r
-            }\r
-        };\r
-        desc.setHandler(handler);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _href\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-    } //-- uk.ac.vamsas.objects.core.LinkDescriptor()\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 uk.ac.vamsas.objects.core.Link.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/uk/ac/vamsas/objects/core/LockFileDescriptor.java b/src/uk/ac/vamsas/objects/core/LockFileDescriptor.java
deleted file mode 100644 (file)
index 2197a4f..0000000
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 LockFileDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class LockFileDescriptor 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 LockFileDescriptor() 
-     {
-        super();
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasDocument";
-        xmlName = "LockFile";
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             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
-            {
-                LockFile target = (LockFile) object;
-                return target.getContent();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    LockFile target = (LockFile) 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
-        
-        //-- initialize element descriptors
-        
-    } //-- uk.ac.vamsas.objects.core.LockFileDescriptor()
-
-
-      //-----------/
-     //- 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 uk.ac.vamsas.objects.core.LockFile.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/uk/ac/vamsas/objects/core/MapDescriptor.java b/src/uk/ac/vamsas/objects/core/MapDescriptor.java
deleted file mode 100644 (file)
index 29c8f5b..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 MapDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class MapDescriptor extends uk.ac.vamsas.objects.core.MapListDescriptor {\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 MapDescriptor() \r
-     {\r
-        super();\r
-        setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.MapListDescriptor());\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "map";\r
-    } //-- uk.ac.vamsas.objects.core.MapDescriptor()\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 uk.ac.vamsas.objects.core.Map.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/uk/ac/vamsas/objects/core/MapListDescriptor.java b/src/uk/ac/vamsas/objects/core/MapListDescriptor.java
deleted file mode 100644 (file)
index 1b761c7..0000000
+++ /dev/null
@@ -1,339 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 MapListDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class MapListDescriptor 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 MapListDescriptor() \r
-     {\r
-        super();\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "mapList";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _from\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_from", "from", 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
-                MapList target = (MapList) object;\r
-                if(!target.hasFrom())\r
-                    return null;\r
-                return new java.lang.Integer(target.getFrom());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    MapList target = (MapList) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteFrom();\r
-                        return;\r
-                    }\r
-                    target.setFrom( ((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.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _from\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
-        //-- _to\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_to", "to", 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
-                MapList target = (MapList) object;\r
-                if(!target.hasTo())\r
-                    return null;\r
-                return new java.lang.Integer(target.getTo());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    MapList target = (MapList) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteTo();\r
-                        return;\r
-                    }\r
-                    target.setTo( ((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.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _to\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
-                MapList target = (MapList) 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
-                    MapList target = (MapList) 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
-        desc.setMultivalued(false);\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
-                MapList target = (MapList) 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
-                    MapList target = (MapList) 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
-        desc.setMultivalued(false);\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
-        //-- initialize element descriptors\r
-        \r
-    } //-- uk.ac.vamsas.objects.core.MapListDescriptor()\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 uk.ac.vamsas.objects.core.MapList.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/uk/ac/vamsas/objects/core/MappingDescriptor.java b/src/uk/ac/vamsas/objects/core/MappingDescriptor.java
deleted file mode 100644 (file)
index 7bd317f..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 MappingDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class MappingDescriptor extends uk.ac.vamsas.objects.core.MapListDescriptor {\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 MappingDescriptor() \r
-     {\r
-        super();\r
-        setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.MapListDescriptor());\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "mapping";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _onto\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Object.class, "_onto", "onto", org.exolab.castor.xml.NodeType.Attribute);\r
-        desc.setReference(true);\r
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                Mapping target = (Mapping) object;\r
-                return target.getOnto();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Mapping target = (Mapping) object;\r
-                    target.setOnto( (java.lang.Object) 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.lang.Object();\r
-            }\r
-        };\r
-        desc.setHandler(handler);\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _onto\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- initialize element descriptors\r
-        \r
-    } //-- uk.ac.vamsas.objects.core.MappingDescriptor()\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 uk.ac.vamsas.objects.core.Mapping.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/uk/ac/vamsas/objects/core/NewickDescriptor.java b/src/uk/ac/vamsas/objects/core/NewickDescriptor.java
deleted file mode 100644 (file)
index c8a0436..0000000
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 NewickDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class NewickDescriptor 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 NewickDescriptor() 
-     {
-        super();
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";
-        xmlName = "newick";
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             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
-            {
-                Newick target = (Newick) object;
-                return target.getContent();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Newick target = (Newick) 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
-        
-        //-- _title
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_title", "title", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Newick target = (Newick) object;
-                return target.getTitle();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Newick target = (Newick) object;
-                    target.setTitle( (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);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _title
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _id
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_id", "id", org.exolab.castor.xml.NodeType.Attribute);
-        this.identity = desc;
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Newick target = (Newick) object;
-                return target.getId();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Newick target = (Newick) object;
-                    target.setId( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new java.lang.String();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _id
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _modifiable
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_modifiable", "modifiable", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Newick target = (Newick) object;
-                return target.getModifiable();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Newick target = (Newick) object;
-                    target.setModifiable( (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);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _modifiable
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-    } //-- uk.ac.vamsas.objects.core.NewickDescriptor()
-
-
-      //-----------/
-     //- 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 uk.ac.vamsas.objects.core.Newick.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/uk/ac/vamsas/objects/core/ParamDescriptor.java b/src/uk/ac/vamsas/objects/core/ParamDescriptor.java
deleted file mode 100644 (file)
index be792c2..0000000
+++ /dev/null
@@ -1,285 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 ParamDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class ParamDescriptor 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 ParamDescriptor() \r
-     {\r
-        super();\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "param";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- _content\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_content", "PCDATA", org.exolab.castor.xml.NodeType.Text);\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
-                Param target = (Param) object;\r
-                return target.getContent();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Param target = (Param) object;\r
-                    target.setContent( (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: _content\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 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
-                Param target = (Param) 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
-                    Param target = (Param) 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
-        desc.setMultivalued(false);\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
-        //-- _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
-                Param target = (Param) 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
-                    Param target = (Param) 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
-        desc.setMultivalued(false);\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
-        //-- initialize element descriptors\r
-        \r
-    } //-- uk.ac.vamsas.objects.core.ParamDescriptor()\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 uk.ac.vamsas.objects.core.Param.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/uk/ac/vamsas/objects/core/PosDescriptor.java b/src/uk/ac/vamsas/objects/core/PosDescriptor.java
deleted file mode 100644 (file)
index 4dc928a..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 PosDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class PosDescriptor 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 PosDescriptor() \r
-     {\r
-        super();\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "pos";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- _i\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_i", "i", 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
-                Pos target = (Pos) object;\r
-                if(!target.hasI())\r
-                    return null;\r
-                return new java.lang.Integer(target.getI());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Pos target = (Pos) object;\r
-                    // ignore null values for non optional primitives\r
-                    if (value == null) return;\r
-                    \r
-                    target.setI( ((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
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _i\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
-        //-- initialize element descriptors\r
-        \r
-    } //-- uk.ac.vamsas.objects.core.PosDescriptor()\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 uk.ac.vamsas.objects.core.Pos.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/uk/ac/vamsas/objects/core/PropertyDescriptor.java b/src/uk/ac/vamsas/objects/core/PropertyDescriptor.java
deleted file mode 100644 (file)
index ad565ea..0000000
+++ /dev/null
@@ -1,285 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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
-     {\r
-        super();\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "property";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- _content\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_content", "PCDATA", org.exolab.castor.xml.NodeType.Text);\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.getContent();\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.setContent( (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: _content\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 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
-        desc.setMultivalued(false);\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
-        //-- _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
-                Property target = (Property) 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
-                    Property target = (Property) 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
-        desc.setMultivalued(false);\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
-        //-- initialize element descriptors\r
-        \r
-    } //-- uk.ac.vamsas.objects.core.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 uk.ac.vamsas.objects.core.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/uk/ac/vamsas/objects/core/ProvenanceDescriptor.java b/src/uk/ac/vamsas/objects/core/ProvenanceDescriptor.java
deleted file mode 100644 (file)
index 10d94c9..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 ProvenanceDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class ProvenanceDescriptor 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 ProvenanceDescriptor() 
-     {
-        super();
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";
-        xmlName = "Provenance";
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- initialize element descriptors
-        
-        //-- _entryList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Entry.class, "_entryList", "entry", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Provenance target = (Provenance) object;
-                return target.getEntry();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Provenance target = (Provenance) object;
-                    target.addEntry( (uk.ac.vamsas.objects.core.Entry) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Entry();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setRequired(true);
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _entryList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- uk.ac.vamsas.objects.core.ProvenanceDescriptor()
-
-
-      //-----------/
-     //- 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 uk.ac.vamsas.objects.core.Provenance.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/uk/ac/vamsas/objects/core/RangeAnnotationDescriptor.java b/src/uk/ac/vamsas/objects/core/RangeAnnotationDescriptor.java
deleted file mode 100644 (file)
index 8ff3c74..0000000
+++ /dev/null
@@ -1,578 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 RangeAnnotationDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class RangeAnnotationDescriptor extends uk.ac.vamsas.objects.core.RangeTypeDescriptor {\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 RangeAnnotationDescriptor() \r
-     {\r
-        super();\r
-        setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.RangeTypeDescriptor());\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "rangeAnnotation";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsSequence();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             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
-        this.identity = desc;\r
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                RangeAnnotation target = (RangeAnnotation) 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
-                    RangeAnnotation target = (RangeAnnotation) 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 new java.lang.String();\r
-            }\r
-        };\r
-        desc.setHandler(handler);\r
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _id\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _modifiable\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_modifiable", "modifiable", 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
-                RangeAnnotation target = (RangeAnnotation) object;\r
-                return target.getModifiable();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    RangeAnnotation target = (RangeAnnotation) object;\r
-                    target.setModifiable( (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.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _modifiable\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
-        //-- _group\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_group", "group", 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
-                RangeAnnotation target = (RangeAnnotation) 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
-                    RangeAnnotation target = (RangeAnnotation) object;\r
-                    target.setGroup( (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.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _group\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
-        //-- _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
-                RangeAnnotation target = (RangeAnnotation) 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
-                    RangeAnnotation target = (RangeAnnotation) 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
-        desc.setMultivalued(false);\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
-        //-- initialize element descriptors\r
-        \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
-                RangeAnnotation target = (RangeAnnotation) 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
-                    RangeAnnotation target = (RangeAnnotation) 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("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");\r
-        desc.setMultivalued(false);\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
-        //-- _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
-                RangeAnnotation target = (RangeAnnotation) 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
-                    RangeAnnotation target = (RangeAnnotation) 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("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");\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
-        //-- _status\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_status", "status", 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
-                RangeAnnotation target = (RangeAnnotation) 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
-                    RangeAnnotation target = (RangeAnnotation) 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
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");\r
-        desc.setMultivalued(false);\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
-        //-- _annotationElementList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.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
-                RangeAnnotation target = (RangeAnnotation) 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
-                    RangeAnnotation target = (RangeAnnotation) object;\r
-                    target.addAnnotationElement( (uk.ac.vamsas.objects.core.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 uk.ac.vamsas.objects.core.AnnotationElement();\r
-            }\r
-        };\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");\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
-        //-- _scoreList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Score.class, "_scoreList", "score", 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
-                RangeAnnotation target = (RangeAnnotation) object;\r
-                return target.getScore();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    RangeAnnotation target = (RangeAnnotation) object;\r
-                    target.addScore( (uk.ac.vamsas.objects.core.Score) 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 uk.ac.vamsas.objects.core.Score();\r
-            }\r
-        };\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _scoreList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _linkList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Link.class, "_linkList", "link", 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
-                RangeAnnotation target = (RangeAnnotation) object;\r
-                return target.getLink();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    RangeAnnotation target = (RangeAnnotation) object;\r
-                    target.addLink( (uk.ac.vamsas.objects.core.Link) 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 uk.ac.vamsas.objects.core.Link();\r
-            }\r
-        };\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _linkList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _propertyList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.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
-                RangeAnnotation target = (RangeAnnotation) 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
-                    RangeAnnotation target = (RangeAnnotation) object;\r
-                    target.addProperty( (uk.ac.vamsas.objects.core.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 uk.ac.vamsas.objects.core.Property();\r
-            }\r
-        };\r
-        desc.setHandler(handler);\r
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");\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
-    } //-- uk.ac.vamsas.objects.core.RangeAnnotationDescriptor()\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 uk.ac.vamsas.objects.core.RangeAnnotation.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/uk/ac/vamsas/objects/core/RangeTypeDescriptor.java b/src/uk/ac/vamsas/objects/core/RangeTypeDescriptor.java
deleted file mode 100644 (file)
index 4a51b29..0000000
+++ /dev/null
@@ -1,246 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 RangeTypeDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class RangeTypeDescriptor 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 RangeTypeDescriptor() \r
-     {\r
-        super();\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "rangeType";\r
-        \r
-        //-- set grouping compositor\r
-        setCompositorAsChoice();\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- initialize attribute descriptors\r
-        \r
-        //-- initialize element descriptors\r
-        \r
-        //-- _posList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Pos.class, "_posList", "pos", 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
-                RangeType target = (RangeType) object;\r
-                return target.getPos();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    RangeType target = (RangeType) object;\r
-                    target.addPos( (uk.ac.vamsas.objects.core.Pos) 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("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _posList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-        //-- _segList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Seg.class, "_segList", "seg", 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
-                RangeType target = (RangeType) object;\r
-                return target.getSeg();\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    RangeType target = (RangeType) object;\r
-                    target.addSeg( (uk.ac.vamsas.objects.core.Seg) 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("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");\r
-        desc.setRequired(true);\r
-        desc.setMultivalued(true);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _segList\r
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(1);\r
-        { //-- local scope\r
-        }\r
-        desc.setValidator(fieldValidator);\r
-    } //-- uk.ac.vamsas.objects.core.RangeTypeDescriptor()\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 uk.ac.vamsas.objects.core.RangeType.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/uk/ac/vamsas/objects/core/ScoreDescriptor.java b/src/uk/ac/vamsas/objects/core/ScoreDescriptor.java
deleted file mode 100644 (file)
index 0cdbb7d..0000000
+++ /dev/null
@@ -1,249 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 ScoreDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class ScoreDescriptor 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 ScoreDescriptor() \r
-     {\r
-        super();\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "score";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             handler        = null;\r
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
-        //-- _content\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(float.class, "_content", "PCDATA", org.exolab.castor.xml.NodeType.Text);\r
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
-            public java.lang.Object getValue( java.lang.Object object ) \r
-                throws IllegalStateException\r
-            {\r
-                Score target = (Score) object;\r
-                if(!target.hasContent())\r
-                    return null;\r
-                return new java.lang.Float(target.getContent());\r
-            }\r
-            public void setValue( java.lang.Object object, java.lang.Object value) \r
-                throws IllegalStateException, IllegalArgumentException\r
-            {\r
-                try {\r
-                    Score target = (Score) object;\r
-                    // if null, use delete method for optional primitives \r
-                    if (value == null) {\r
-                        target.deleteContent();\r
-                        return;\r
-                    }\r
-                    target.setContent( ((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: _content\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 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
-                Score target = (Score) 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
-                    Score target = (Score) 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.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
-        //-- initialize element descriptors\r
-        \r
-    } //-- uk.ac.vamsas.objects.core.ScoreDescriptor()\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 uk.ac.vamsas.objects.core.Score.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/uk/ac/vamsas/objects/core/SegDescriptor.java b/src/uk/ac/vamsas/objects/core/SegDescriptor.java
deleted file mode 100644 (file)
index 8024f02..0000000
+++ /dev/null
@@ -1,297 +0,0 @@
-/*\r
- * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
- * Schema.\r
- * $Id$\r
- */\r
-\r
-package uk.ac.vamsas.objects.core;\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 SegDescriptor.\r
- * \r
- * @version $Revision$ $Date$\r
- */\r
-public class SegDescriptor 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 SegDescriptor() \r
-     {\r
-        super();\r
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";\r
-        xmlName = "seg";\r
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;\r
-        org.exolab.castor.mapping.FieldHandler             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
-                Seg target = (Seg) 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
-                    Seg target = (Seg) 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
-        desc.setMultivalued(false);\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
-                Seg target = (Seg) 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
-                    Seg target = (Seg) 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
-        desc.setMultivalued(false);\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
-        //-- _inclusive\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_inclusive", "inclusive", 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
-                Seg target = (Seg) object;\r
-                if(!target.hasInclusive())\r
-                    return null;\r
-                return (target.getInclusive() ? 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
-                    Seg target = (Seg) object;\r
-                    // ignore null values for non optional primitives\r
-                    if (value == null) return;\r
-                    \r
-                    target.setInclusive( ((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
-        desc.setMultivalued(false);\r
-        addFieldDescriptor(desc);\r
-        \r
-        //-- validation code for: _inclusive\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
-    } //-- uk.ac.vamsas.objects.core.SegDescriptor()\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 uk.ac.vamsas.objects.core.Seg.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/uk/ac/vamsas/objects/core/SequenceDescriptor.java b/src/uk/ac/vamsas/objects/core/SequenceDescriptor.java
deleted file mode 100644 (file)
index 56890f1..0000000
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 SequenceDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class SequenceDescriptor extends uk.ac.vamsas.objects.core.SequenceTypeDescriptor {
-
-
-      //--------------------------/
-     //- 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 SequenceDescriptor() 
-     {
-        super();
-        setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.SequenceTypeDescriptor());
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";
-        xmlName = "Sequence";
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _id
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_id", "id", org.exolab.castor.xml.NodeType.Attribute);
-        this.identity = desc;
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Sequence target = (Sequence) object;
-                return target.getId();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Sequence target = (Sequence) object;
-                    target.setId( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new java.lang.String();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _id
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _dictionary
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_dictionary", "dictionary", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Sequence target = (Sequence) object;
-                return target.getDictionary();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Sequence target = (Sequence) object;
-                    target.setDictionary( (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);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _dictionary
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _dbRefList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.DbRef.class, "_dbRefList", "dbRef", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Sequence target = (Sequence) object;
-                return target.getDbRef();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Sequence target = (Sequence) object;
-                    target.addDbRef( (uk.ac.vamsas.objects.core.DbRef) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.DbRef();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _dbRefList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- uk.ac.vamsas.objects.core.SequenceDescriptor()
-
-
-      //-----------/
-     //- 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 super.getExtends();
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        if (identity == null)
-            return super.getIdentity();
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return uk.ac.vamsas.objects.core.Sequence.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/uk/ac/vamsas/objects/core/SequenceTypeDescriptor.java b/src/uk/ac/vamsas/objects/core/SequenceTypeDescriptor.java
deleted file mode 100644 (file)
index 24ec488..0000000
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 SequenceTypeDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class SequenceTypeDescriptor 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 SequenceTypeDescriptor() 
-     {
-        super();
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";
-        xmlName = "SequenceType";
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _start
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_start", "start", org.exolab.castor.xml.NodeType.Attribute);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                SequenceType target = (SequenceType) object;
-                if(!target.hasStart())
-                    return null;
-                return new java.lang.Integer(target.getStart());
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    SequenceType target = (SequenceType) object;
-                    // ignore null values for non optional primitives
-                    if (value == null) return;
-                    
-                    target.setStart( ((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);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _start
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            IntegerValidator typeValidator = new IntegerValidator();
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _end
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_end", "end", org.exolab.castor.xml.NodeType.Attribute);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                SequenceType target = (SequenceType) object;
-                if(!target.hasEnd())
-                    return null;
-                return new java.lang.Integer(target.getEnd());
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    SequenceType target = (SequenceType) object;
-                    // ignore null values for non optional primitives
-                    if (value == null) return;
-                    
-                    target.setEnd( ((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);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _end
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            IntegerValidator typeValidator = new IntegerValidator();
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _sequence
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_sequence", "sequence", org.exolab.castor.xml.NodeType.Element);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                SequenceType target = (SequenceType) object;
-                return target.getSequence();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    SequenceType target = (SequenceType) object;
-                    target.setSequence( (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);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _sequence
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _name
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", org.exolab.castor.xml.NodeType.Element);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                SequenceType target = (SequenceType) object;
-                return target.getName();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    SequenceType target = (SequenceType) object;
-                    target.setName( (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);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _name
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _description
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_description", "description", org.exolab.castor.xml.NodeType.Element);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                SequenceType target = (SequenceType) object;
-                return target.getDescription();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    SequenceType target = (SequenceType) object;
-                    target.setDescription( (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);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _description
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _propertyList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Property.class, "_propertyList", "property", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                SequenceType target = (SequenceType) object;
-                return target.getProperty();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    SequenceType target = (SequenceType) object;
-                    target.addProperty( (uk.ac.vamsas.objects.core.Property) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Property();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _propertyList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _mappingList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Mapping.class, "_mappingList", "mapping", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                SequenceType target = (SequenceType) object;
-                return target.getMapping();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    SequenceType target = (SequenceType) object;
-                    target.addMapping( (uk.ac.vamsas.objects.core.Mapping) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Mapping();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _mappingList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- uk.ac.vamsas.objects.core.SequenceTypeDescriptor()
-
-
-      //-----------/
-     //- 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 uk.ac.vamsas.objects.core.SequenceType.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/uk/ac/vamsas/objects/core/TreeDescriptor.java b/src/uk/ac/vamsas/objects/core/TreeDescriptor.java
deleted file mode 100644 (file)
index 00ee704..0000000
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 TreeDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class TreeDescriptor 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 TreeDescriptor() 
-     {
-        super();
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";
-        xmlName = "Tree";
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _id
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_id", "id", org.exolab.castor.xml.NodeType.Attribute);
-        this.identity = desc;
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Tree target = (Tree) object;
-                return target.getId();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Tree target = (Tree) object;
-                    target.setId( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new java.lang.String();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _id
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _modifiable
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_modifiable", "modifiable", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Tree target = (Tree) object;
-                return target.getModifiable();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Tree target = (Tree) object;
-                    target.setModifiable( (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);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _modifiable
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _title
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_title", "title", org.exolab.castor.xml.NodeType.Element);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Tree target = (Tree) object;
-                return target.getTitle();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Tree target = (Tree) object;
-                    target.setTitle( (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);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _title
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _newickList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Newick.class, "_newickList", "newick", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Tree target = (Tree) object;
-                return target.getNewick();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Tree target = (Tree) object;
-                    target.addNewick( (uk.ac.vamsas.objects.core.Newick) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Newick();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setRequired(true);
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _newickList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _propertyList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Property.class, "_propertyList", "property", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Tree target = (Tree) object;
-                return target.getProperty();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Tree target = (Tree) object;
-                    target.addProperty( (uk.ac.vamsas.objects.core.Property) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Property();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _propertyList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _provenance
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Provenance.class, "_provenance", "Provenance", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                Tree target = (Tree) object;
-                return target.getProvenance();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    Tree target = (Tree) object;
-                    target.setProvenance( (uk.ac.vamsas.objects.core.Provenance) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Provenance();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _provenance
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- uk.ac.vamsas.objects.core.TreeDescriptor()
-
-
-      //-----------/
-     //- 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 uk.ac.vamsas.objects.core.Tree.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/uk/ac/vamsas/objects/core/UserDescriptor.java b/src/uk/ac/vamsas/objects/core/UserDescriptor.java
deleted file mode 100644 (file)
index 2630c49..0000000
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 UserDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class UserDescriptor extends uk.ac.vamsas.objects.core.AppDataDescriptor {
-
-
-      //--------------------------/
-     //- 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 UserDescriptor() 
-     {
-        super();
-        setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.AppDataDescriptor());
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";
-        xmlName = "User";
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _fullname
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_fullname", "fullname", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                User target = (User) object;
-                return target.getFullname();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    User target = (User) object;
-                    target.setFullname( (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);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _fullname
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _organization
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_organization", "organization", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                User target = (User) object;
-                return target.getOrganization();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    User target = (User) object;
-                    target.setOrganization( (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);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _organization
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-    } //-- uk.ac.vamsas.objects.core.UserDescriptor()
-
-
-      //-----------/
-     //- 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 super.getExtends();
-    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
-
-    /**
-     * Method getIdentity
-     * 
-     * 
-     * 
-     * @return FieldDescriptor
-     */
-    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
-    {
-        if (identity == null)
-            return super.getIdentity();
-        return identity;
-    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
-
-    /**
-     * Method getJavaClass
-     * 
-     * 
-     * 
-     * @return Class
-     */
-    public java.lang.Class getJavaClass()
-    {
-        return uk.ac.vamsas.objects.core.User.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/uk/ac/vamsas/objects/core/VAMSASDescriptor.java b/src/uk/ac/vamsas/objects/core/VAMSASDescriptor.java
deleted file mode 100644 (file)
index f5c87ad..0000000
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 VAMSASDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class VAMSASDescriptor 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 VAMSASDescriptor() 
-     {
-        super();
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes";
-        xmlName = "VAMSAS";
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- _id
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_id", "id", org.exolab.castor.xml.NodeType.Attribute);
-        this.identity = desc;
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                VAMSAS target = (VAMSAS) object;
-                return target.getId();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    VAMSAS target = (VAMSAS) object;
-                    target.setId( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new java.lang.String();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _id
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _modifiable
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_modifiable", "modifiable", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                VAMSAS target = (VAMSAS) object;
-                return target.getModifiable();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    VAMSAS target = (VAMSAS) object;
-                    target.setModifiable( (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);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _modifiable
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
-        
-        //-- _treeList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Tree.class, "_treeList", "Tree", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                VAMSAS target = (VAMSAS) object;
-                return target.getTree();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    VAMSAS target = (VAMSAS) object;
-                    target.addTree( (uk.ac.vamsas.objects.core.Tree) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.Tree();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _treeList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _dataSetList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.DataSet.class, "_dataSetList", "DataSet", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                VAMSAS target = (VAMSAS) object;
-                return target.getDataSet();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    VAMSAS target = (VAMSAS) object;
-                    target.addDataSet( (uk.ac.vamsas.objects.core.DataSet) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.DataSet();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _dataSetList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- uk.ac.vamsas.objects.core.VAMSASDescriptor()
-
-
-      //-----------/
-     //- 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 uk.ac.vamsas.objects.core.VAMSAS.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/uk/ac/vamsas/objects/core/VamsasDocumentDescriptor.java b/src/uk/ac/vamsas/objects/core/VamsasDocumentDescriptor.java
deleted file mode 100644 (file)
index 010626d..0000000
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
- * Schema.
- * $Id$
- */
-
-package uk.ac.vamsas.objects.core;
-
-  //---------------------------------/
- //- 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 VamsasDocumentDescriptor.
- * 
- * @version $Revision$ $Date$
- */
-public class VamsasDocumentDescriptor 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 VamsasDocumentDescriptor() 
-     {
-        super();
-        nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasDocument";
-        xmlName = "VamsasDocument";
-        
-        //-- set grouping compositor
-        setCompositorAsSequence();
-        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
-        org.exolab.castor.mapping.FieldHandler             handler        = null;
-        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
-        //-- initialize attribute descriptors
-        
-        //-- initialize element descriptors
-        
-        //-- _version
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_version", "Version", org.exolab.castor.xml.NodeType.Element);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                VamsasDocument target = (VamsasDocument) object;
-                return target.getVersion();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    VamsasDocument target = (VamsasDocument) object;
-                    target.setVersion( (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);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasDocument");
-        desc.setRequired(true);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _version
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _lockFile
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.LockFile.class, "_lockFile", "LockFile", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                VamsasDocument target = (VamsasDocument) object;
-                return target.getLockFile();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    VamsasDocument target = (VamsasDocument) object;
-                    target.setLockFile( (uk.ac.vamsas.objects.core.LockFile) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new uk.ac.vamsas.objects.core.LockFile();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasDocument");
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _lockFile
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _provenance
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(Provenance.class, "_provenance", "Provenance", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                VamsasDocument target = (VamsasDocument) object;
-                return target.getProvenance();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    VamsasDocument target = (VamsasDocument) object;
-                    target.setProvenance( (Provenance) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new Provenance();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _provenance
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _VAMSASList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(VAMSAS.class, "_VAMSASList", "VAMSAS", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                VamsasDocument target = (VamsasDocument) object;
-                return target.getVAMSAS();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    VamsasDocument target = (VamsasDocument) object;
-                    target.addVAMSAS( (VAMSAS) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new VAMSAS();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setRequired(true);
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _VAMSASList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _applicationDataList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(ApplicationData.class, "_applicationDataList", "ApplicationData", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                VamsasDocument target = (VamsasDocument) object;
-                return target.getApplicationData();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    VamsasDocument target = (VamsasDocument) object;
-                    target.addApplicationData( (ApplicationData) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new ApplicationData();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _applicationDataList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-        //-- _attachmentList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(Attachment.class, "_attachmentList", "Attachment", org.exolab.castor.xml.NodeType.Element);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                VamsasDocument target = (VamsasDocument) object;
-                return target.getAttachment();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    VamsasDocument target = (VamsasDocument) object;
-                    target.addAttachment( (Attachment) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new Attachment();
-            }
-        };
-        desc.setHandler(handler);
-        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");
-        desc.setMultivalued(true);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _attachmentList
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
-        { //-- local scope
-        }
-        desc.setValidator(fieldValidator);
-    } //-- uk.ac.vamsas.objects.core.VamsasDocumentDescriptor()
-
-
-      //-----------/
-     //- 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 uk.ac.vamsas.objects.core.VamsasDocument.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() 
-
-}