fixed the User element and the form of the ApplicationData dataType.xsd definition.

[vamsas.git] / src / org / vamsas / objects / core / AppDataDescriptor.java

diff --git a/src/org/vamsas/objects/core/AppDataDescriptor.java b/src/org/vamsas/objects/core/AppDataDescriptor.java
index c667bc8..50377d3 100644 (file)
--- a/src/org/vamsas/objects/core/AppDataDescriptor.java
+++ b/src/org/vamsas/objects/core/AppDataDescriptor.java
@@ -60,7 +60,7 @@ public class AppDataDescriptor extends org.exolab.castor.xml.util.XMLClassDescri
         xmlName = "appData";
         
         //-- set grouping compositor
-        setCompositorAsSequence();
+        setCompositorAsChoice();
         org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
         org.exolab.castor.mapping.FieldHandler             handler        = null;
         org.exolab.castor.xml.FieldValidator               fieldValidator = null;
@@ -68,78 +68,80 @@ public class AppDataDescriptor extends org.exolab.castor.xml.util.XMLClassDescri
         
         //-- initialize element descriptors
         
-        //-- _appDataChoice
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.vamsas.objects.core.AppDataChoice.class, "_appDataChoice", "-error-if-this-is-used-", org.exolab.castor.xml.NodeType.Element);
+        //-- _data
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(byte[].class, "_data", "data", org.exolab.castor.xml.NodeType.Element);
         handler = new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
             {
                 AppData target = (AppData) object;
-                return target.getAppDataChoice();
+                return target.getData();
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
             {
                 try {
                     AppData target = (AppData) object;
-                    target.setAppDataChoice( (org.vamsas.objects.core.AppDataChoice) value);
+                    target.setData( (byte[]) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
                 }
             }
             public java.lang.Object newInstance( java.lang.Object parent ) {
-                return new org.vamsas.objects.core.AppDataChoice();
+                return null;
             }
         };
         desc.setHandler(handler);
-        desc.setContainer(true);
-        desc.setClassDescriptor(new org.vamsas.objects.core.AppDataChoiceDescriptor());
         desc.setNameSpaceURI("http://www.vamsas.org");
         desc.setRequired(true);
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _appDataChoice
+        //-- validation code for: _data
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         fieldValidator.setMinOccurs(1);
         { //-- local scope
         }
         desc.setValidator(fieldValidator);
-        //-- _userList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.vamsas.objects.core.User.class, "_userList", "User", org.exolab.castor.xml.NodeType.Element);
+        //-- _dataReference
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_dataReference", "dataReference", 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
             {
                 AppData target = (AppData) object;
-                return target.getUser();
+                return target.getDataReference();
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
             {
                 try {
                     AppData target = (AppData) object;
-                    target.addUser( (org.vamsas.objects.core.User) value);
+                    target.setDataReference( (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 org.vamsas.objects.core.User();
+                return null;
             }
         };
         desc.setHandler(handler);
         desc.setNameSpaceURI("http://www.vamsas.org");
         desc.setRequired(true);
-        desc.setMultivalued(true);
+        desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _userList
+        //-- validation code for: _dataReference
         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);
     } //-- org.vamsas.objects.core.AppDataDescriptor()