schema update

git-svn-id: https://svn.lifesci.dundee.ac.uk/svn/repository/trunk@112 be28352e-c001-0410-b1a7-c7978e42abec

diff --git a/src/org/vamsas/objects/core/AppDataChoice.java b/src/org/vamsas/objects/core/AppDataChoice.java
index 06d07bd..599844a 100644 (file)
--- a/src/org/vamsas/objects/core/AppDataChoice.java
+++ b/src/org/vamsas/objects/core/AppDataChoice.java
@@ -38,12 +38,12 @@ implements java.io.Serializable
     /**
      * Field _data
      */
-    private java.lang.String _data;
+    private byte[] _data;
 
     /**
      * Field _dataReference
      */
-    private byte[] _dataReference;
+    private java.lang.String _dataReference;
 
 
       //----------------/
@@ -99,24 +99,24 @@ implements java.io.Serializable
     /**
      * Returns the value of field 'data'.
      * 
-     * @return String
+     * @return byte
      * @return the value of field 'data'.
      */
-    public java.lang.String getData()
+    public byte[] getData()
     {
         return this._data;
-    } //-- java.lang.String getData() 
+    } //-- byte[] getData() 
 
     /**
      * Returns the value of field 'dataReference'.
      * 
-     * @return byte
+     * @return String
      * @return the value of field 'dataReference'.
      */
-    public byte[] getDataReference()
+    public java.lang.String getDataReference()
     {
         return this._dataReference;
-    } //-- byte[] getDataReference() 
+    } //-- java.lang.String getDataReference() 
 
     /**
      * Method isValid
@@ -169,20 +169,20 @@ implements java.io.Serializable
      * 
      * @param data the value of field 'data'.
      */
-    public void setData(java.lang.String data)
+    public void setData(byte[] data)
     {
         this._data = data;
-    } //-- void setData(java.lang.String) 
+    } //-- void setData(byte) 
 
     /**
      * Sets the value of field 'dataReference'.
      * 
      * @param dataReference the value of field 'dataReference'.
      */
-    public void setDataReference(byte[] dataReference)
+    public void setDataReference(java.lang.String dataReference)
     {
         this._dataReference = dataReference;
-    } //-- void setDataReference(byte) 
+    } //-- void setDataReference(java.lang.String) 
 
     /**
      * Method unmarshal

diff --git a/src/org/vamsas/objects/core/AppDataChoiceDescriptor.java b/src/org/vamsas/objects/core/AppDataChoiceDescriptor.java
index 1d46b62..a158b8c 100644 (file)
--- a/src/org/vamsas/objects/core/AppDataChoiceDescriptor.java
+++ b/src/org/vamsas/objects/core/AppDataChoiceDescriptor.java
@@ -68,8 +68,7 @@ public class AppDataChoiceDescriptor extends org.exolab.castor.xml.util.XMLClass
         //-- initialize element descriptors
         
         //-- _data
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_data", "data", org.exolab.castor.xml.NodeType.Element);
-        desc.setImmutable(true);
+        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
@@ -82,7 +81,7 @@ public class AppDataChoiceDescriptor extends org.exolab.castor.xml.util.XMLClass
             {
                 try {
                     AppDataChoice target = (AppDataChoice) object;
-                    target.setData( (java.lang.String) value);
+                    target.setData( (byte[]) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -102,13 +101,11 @@ public class AppDataChoiceDescriptor extends org.exolab.castor.xml.util.XMLClass
         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);
         //-- _dataReference
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(byte[].class, "_dataReference", "dataReference", org.exolab.castor.xml.NodeType.Element);
+        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
@@ -121,7 +118,7 @@ public class AppDataChoiceDescriptor extends org.exolab.castor.xml.util.XMLClass
             {
                 try {
                     AppDataChoice target = (AppDataChoice) object;
-                    target.setDataReference( (byte[]) value);
+                    target.setDataReference( (java.lang.String) value);
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -141,6 +138,9 @@ public class AppDataChoiceDescriptor extends org.exolab.castor.xml.util.XMLClass
         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.AppDataChoiceDescriptor()