X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Forg%2Fvamsas%2Fobjects%2Fcore%2FApplicationDataDescriptor.java;h=894e9450f16a1d8b47c85866e6c0453eefd37095;hb=127eed38a79f4e1b56457a3cd5c5de12c9c7d4a2;hp=9e0648eed910f8650eb8d215d659418157f61459;hpb=2b329d524c11576c358e631d2005640fd51b1c55;p=vamsas.git

diff --git a/src/org/vamsas/objects/core/ApplicationDataDescriptor.java b/src/org/vamsas/objects/core/ApplicationDataDescriptor.java
index 9e0648e..894e945 100644
--- a/src/org/vamsas/objects/core/ApplicationDataDescriptor.java
+++ b/src/org/vamsas/objects/core/ApplicationDataDescriptor.java
@@ -145,69 +145,99 @@ public class ApplicationDataDescriptor extends org.vamsas.objects.core.AppDataDe
             fieldValidator.setValidator(typeValidator);
         }
         desc.setValidator(fieldValidator);
-        //-- _urn
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_urn", "urn", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
+        //-- initialize element descriptors
+        
+        //-- _userList
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.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.getUrn();
+                return target.getUser();
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
             {
                 try {
                     ApplicationData target = (ApplicationData) object;
-                    target.setUrn( (java.lang.String) value);
+                    target.addUser( (org.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 null;
+                return new org.vamsas.objects.core.User();
             }
         };
         desc.setHandler(handler);
-        desc.setRequired(true);
-        desc.setMultivalued(false);
+        desc.setNameSpaceURI("http://www.vamsas.org");
+        desc.setMultivalued(true);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _urn
+        //-- validation code for: _userList
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
+        fieldValidator.setMinOccurs(0);
         { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
         }
         desc.setValidator(fieldValidator);
-        //-- initialize element descriptors
+        //-- _common
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.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( (org.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 org.vamsas.objects.core.Common();
+            }
+        };
+        desc.setHandler(handler);
+        desc.setNameSpaceURI("http://www.vamsas.org");
+        desc.setMultivalued(false);
+        addFieldDescriptor(desc);
         
-        //-- _userList
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.vamsas.objects.core.User.class, "_userList", "User", org.exolab.castor.xml.NodeType.Element);
+        //-- 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(org.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.getUser();
+                return target.getInstance();
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
             {
                 try {
                     ApplicationData target = (ApplicationData) object;
-                    target.addUser( (org.vamsas.objects.core.User) value);
+                    target.addInstance( (org.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 org.vamsas.objects.core.User();
+                return new org.vamsas.objects.core.Instance();
             }
         };
         desc.setHandler(handler);
@@ -215,7 +245,7 @@ public class ApplicationDataDescriptor extends org.vamsas.objects.core.AppDataDe
         desc.setMultivalued(true);
         addFieldDescriptor(desc);
         
-        //-- validation code for: _userList
+        //-- validation code for: _instanceList
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         fieldValidator.setMinOccurs(0);
         { //-- local scope