X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Forg%2Fvamsas%2Fobjects%2Fcore%2FDataSetAnnotationsDescriptor.java;h=f74d6bca699bca2708420dcede561dee681b4425;hb=349c4a3b6842fd54d791e0a92728dba294b30488;hp=09af6d96625b453dee60b1d634b5557414c3163b;hpb=31a237800ee9c6a324426645d395ae32db885a8e;p=vamsas.git

diff --git a/src/org/vamsas/objects/core/DataSetAnnotationsDescriptor.java b/src/org/vamsas/objects/core/DataSetAnnotationsDescriptor.java
index 09af6d9..f74d6bc 100644
--- a/src/org/vamsas/objects/core/DataSetAnnotationsDescriptor.java
+++ b/src/org/vamsas/objects/core/DataSetAnnotationsDescriptor.java
@@ -106,21 +106,25 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
         }
         desc.setValidator(fieldValidator);
         //-- _end
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_end", "end", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
+        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
             {
                 DataSetAnnotations target = (DataSetAnnotations) object;
-                return target.getEnd();
+                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 {
                     DataSetAnnotations target = (DataSetAnnotations) object;
-                    target.setEnd( (java.lang.String) value);
+                    // 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());
@@ -139,27 +143,30 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         fieldValidator.setMinOccurs(1);
         { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
+            IntegerValidator typeValidator = new IntegerValidator();
             fieldValidator.setValidator(typeValidator);
         }
         desc.setValidator(fieldValidator);
         //-- _begin
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_begin", "begin", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_begin", "begin", org.exolab.castor.xml.NodeType.Attribute);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 DataSetAnnotations target = (DataSetAnnotations) object;
-                return target.getBegin();
+                if(!target.hasBegin())
+                    return null;
+                return new java.lang.Integer(target.getBegin());
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
             {
                 try {
                     DataSetAnnotations target = (DataSetAnnotations) object;
-                    target.setBegin( (java.lang.String) value);
+                    // ignore null values for non optional primitives
+                    if (value == null) return;
+                    
+                    target.setBegin( ((java.lang.Integer)value).intValue());
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -178,8 +185,7 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         fieldValidator.setMinOccurs(1);
         { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
+            IntegerValidator typeValidator = new IntegerValidator();
             fieldValidator.setValidator(typeValidator);
         }
         desc.setValidator(fieldValidator);
@@ -392,12 +398,13 @@ public class DataSetAnnotationsDescriptor extends org.exolab.castor.xml.util.XML
         };
         desc.setHandler(handler);
         desc.setNameSpaceURI("http://www.vamsas.org");
+        desc.setRequired(true);
         desc.setMultivalued(true);
         addFieldDescriptor(desc);
         
         //-- validation code for: _provenanceList
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(0);
+        fieldValidator.setMinOccurs(1);
         { //-- local scope
         }
         desc.setValidator(fieldValidator);