New schema, new objects

[jalview.git] / src / org / vamsas / objects / core / DataSetAnnotationsDescriptor.java

diff --git a/src/org/vamsas/objects/core/DataSetAnnotationsDescriptor.java b/src/org/vamsas/objects/core/DataSetAnnotationsDescriptor.java
index fdebfc2..9dcbb86 100755 (executable)
--- a/src/org/vamsas/objects/core/DataSetAnnotationsDescriptor.java
+++ b/src/org/vamsas/objects/core/DataSetAnnotationsDescriptor.java
@@ -1,6 +1,6 @@
 /*\r
  * This class was automatically generated with \r
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML\r
+ * <a href="http://www.castor.org">Castor 0.9.6</a>, using an XML\r
  * Schema.\r
  * $Id$\r
  */\r
@@ -53,8 +53,7 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
      //- Constructors -/\r
     //----------------/\r
 \r
-    public DataSetAnnotationsDescriptor() \r
-     {\r
+    public DataSetAnnotationsDescriptor() {\r
         super();\r
         nsURI = "http://www.vamsas.org";\r
         xmlName = "DataSetAnnotations";\r
@@ -62,14 +61,14 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
         //-- 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.XMLFieldHandler              handler        = null;\r
         org.exolab.castor.xml.FieldValidator               fieldValidator = null;\r
         //-- initialize attribute descriptors\r
         \r
         //-- _type\r
         desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_type", "type", org.exolab.castor.xml.NodeType.Attribute);\r
         desc.setImmutable(true);\r
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
             public java.lang.Object getValue( java.lang.Object object ) \r
                 throws IllegalStateException\r
             {\r
@@ -90,10 +89,9 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
             public java.lang.Object newInstance( java.lang.Object parent ) {\r
                 return null;\r
             }\r
-        };\r
+        } );\r
         desc.setHandler(handler);\r
         desc.setRequired(true);\r
-        desc.setMultivalued(false);\r
         addFieldDescriptor(desc);\r
         \r
         //-- validation code for: _type\r
@@ -106,21 +104,25 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
         }\r
         desc.setValidator(fieldValidator);\r
         //-- _end\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_end", "end", org.exolab.castor.xml.NodeType.Attribute);\r
-        desc.setImmutable(true);\r
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {\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
                 DataSetAnnotations target = (DataSetAnnotations) object;\r
-                return target.getEnd();\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
                     DataSetAnnotations target = (DataSetAnnotations) object;\r
-                    target.setEnd( (java.lang.String) value);\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
@@ -129,37 +131,39 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
             public java.lang.Object newInstance( java.lang.Object parent ) {\r
                 return null;\r
             }\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
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
+            IntegerValidator typeValidator = new IntegerValidator();\r
             fieldValidator.setValidator(typeValidator);\r
         }\r
         desc.setValidator(fieldValidator);\r
         //-- _begin\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_begin", "begin", org.exolab.castor.xml.NodeType.Attribute);\r
-        desc.setImmutable(true);\r
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_begin", "begin", org.exolab.castor.xml.NodeType.Attribute);\r
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
             public java.lang.Object getValue( java.lang.Object object ) \r
                 throws IllegalStateException\r
             {\r
                 DataSetAnnotations target = (DataSetAnnotations) object;\r
-                return target.getBegin();\r
+                if(!target.hasBegin())\r
+                    return null;\r
+                return new java.lang.Integer(target.getBegin());\r
             }\r
             public void setValue( java.lang.Object object, java.lang.Object value) \r
                 throws IllegalStateException, IllegalArgumentException\r
             {\r
                 try {\r
                     DataSetAnnotations target = (DataSetAnnotations) object;\r
-                    target.setBegin( (java.lang.String) value);\r
+                    // ignore null values for non optional primitives\r
+                    if (value == null) return;\r
+                    \r
+                    target.setBegin( ((java.lang.Integer)value).intValue());\r
                 }\r
                 catch (java.lang.Exception ex) {\r
                     throw new IllegalStateException(ex.toString());\r
@@ -168,25 +172,23 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
             public java.lang.Object newInstance( java.lang.Object parent ) {\r
                 return null;\r
             }\r
-        };\r
+        } );\r
         desc.setHandler(handler);\r
         desc.setRequired(true);\r
-        desc.setMultivalued(false);\r
         addFieldDescriptor(desc);\r
         \r
         //-- validation code for: _begin\r
         fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
         fieldValidator.setMinOccurs(1);\r
         { //-- local scope\r
-            StringValidator typeValidator = new StringValidator();\r
-            typeValidator.setWhiteSpace("preserve");\r
+            IntegerValidator typeValidator = new IntegerValidator();\r
             fieldValidator.setValidator(typeValidator);\r
         }\r
         desc.setValidator(fieldValidator);\r
         //-- _seqRef\r
         desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Object.class, "_seqRef", "seqRef", org.exolab.castor.xml.NodeType.Attribute);\r
         desc.setReference(true);\r
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
             public java.lang.Object getValue( java.lang.Object object ) \r
                 throws IllegalStateException\r
             {\r
@@ -207,10 +209,9 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
             public java.lang.Object newInstance( java.lang.Object parent ) {\r
                 return new java.lang.Object();\r
             }\r
-        };\r
+        } );\r
         desc.setHandler(handler);\r
         desc.setRequired(true);\r
-        desc.setMultivalued(false);\r
         addFieldDescriptor(desc);\r
         \r
         //-- validation code for: _seqRef\r
@@ -222,7 +223,7 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
         //-- _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
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
             public java.lang.Object getValue( java.lang.Object object ) \r
                 throws IllegalStateException\r
             {\r
@@ -243,9 +244,8 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
             public java.lang.Object newInstance( java.lang.Object parent ) {\r
                 return new java.lang.String();\r
             }\r
-        };\r
+        } );\r
         desc.setHandler(handler);\r
-        desc.setMultivalued(false);\r
         addFieldDescriptor(desc);\r
         \r
         //-- validation code for: _id\r
@@ -258,7 +258,7 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
         //-- _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
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
             public java.lang.Object getValue( java.lang.Object object ) \r
                 throws IllegalStateException\r
             {\r
@@ -279,7 +279,7 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
             public java.lang.Object newInstance( java.lang.Object parent ) {\r
                 return null;\r
             }\r
-        };\r
+        } );\r
         desc.setHandler(handler);\r
         desc.setNameSpaceURI("http://www.vamsas.org");\r
         desc.setMultivalued(false);\r
@@ -296,7 +296,7 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
         //-- _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
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
             public java.lang.Object getValue( java.lang.Object object ) \r
                 throws IllegalStateException\r
             {\r
@@ -317,7 +317,7 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
             public java.lang.Object newInstance( java.lang.Object parent ) {\r
                 return null;\r
             }\r
-        };\r
+        } );\r
         desc.setHandler(handler);\r
         desc.setNameSpaceURI("http://www.vamsas.org");\r
         desc.setMultivalued(false);\r
@@ -333,7 +333,7 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
         desc.setValidator(fieldValidator);\r
         //-- _annotationElementList\r
         desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.vamsas.objects.core.AnnotationElement.class, "_annotationElementList", "annotationElement", org.exolab.castor.xml.NodeType.Element);\r
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
             public java.lang.Object getValue( java.lang.Object object ) \r
                 throws IllegalStateException\r
             {\r
@@ -354,7 +354,7 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
             public java.lang.Object newInstance( java.lang.Object parent ) {\r
                 return new org.vamsas.objects.core.AnnotationElement();\r
             }\r
-        };\r
+        } );\r
         desc.setHandler(handler);\r
         desc.setNameSpaceURI("http://www.vamsas.org");\r
         desc.setMultivalued(true);\r
@@ -368,7 +368,7 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
         desc.setValidator(fieldValidator);\r
         //-- _provenanceList\r
         desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.vamsas.objects.core.Provenance.class, "_provenanceList", "Provenance", org.exolab.castor.xml.NodeType.Element);\r
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
             public java.lang.Object getValue( java.lang.Object object ) \r
                 throws IllegalStateException\r
             {\r
@@ -389,7 +389,7 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
             public java.lang.Object newInstance( java.lang.Object parent ) {\r
                 return new org.vamsas.objects.core.Provenance();\r
             }\r
-        };\r
+        } );\r
         desc.setHandler(handler);\r
         desc.setNameSpaceURI("http://www.vamsas.org");\r
         desc.setRequired(true);\r