removed after schema modification,

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

diff --git a/src/org/vamsas/objects/core/UserDescriptor.java b/src/org/vamsas/objects/core/UserDescriptor.java
index c38181a..a90dbb1 100644 (file)
--- a/src/org/vamsas/objects/core/UserDescriptor.java
+++ b/src/org/vamsas/objects/core/UserDescriptor.java
@@ -21,7 +21,7 @@ import org.exolab.castor.xml.validators.*;
  * 
  * @version $Revision$ $Date$
  */
-public class UserDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
+public class UserDescriptor extends org.vamsas.objects.core.AppDataDescriptor {
 
 
       //--------------------------/
@@ -56,6 +56,7 @@ public class UserDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto
     public UserDescriptor() 
      {
         super();
+        setExtendsWithoutFlatten(new org.vamsas.objects.core.AppDataDescriptor());
         nsURI = "http://www.vamsas.org";
         xmlName = "User";
         org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
@@ -89,11 +90,13 @@ public class UserDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto
             }
         };
         desc.setHandler(handler);
+        desc.setRequired(true);
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
         //-- validation code for: _fullname
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
+        fieldValidator.setMinOccurs(1);
         { //-- local scope
             StringValidator typeValidator = new StringValidator();
             typeValidator.setWhiteSpace("preserve");
@@ -126,48 +129,13 @@ public class UserDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto
             }
         };
         desc.setHandler(handler);
+        desc.setRequired(true);
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
         
         //-- validation code for: _organization
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        { //-- local scope
-            StringValidator typeValidator = new StringValidator();
-            typeValidator.setWhiteSpace("preserve");
-            fieldValidator.setValidator(typeValidator);
-        }
-        desc.setValidator(fieldValidator);
-        //-- _data
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_data", "data", org.exolab.castor.xml.NodeType.Attribute);
-        desc.setImmutable(true);
-        handler = new org.exolab.castor.xml.XMLFieldHandler() {
-            public java.lang.Object getValue( java.lang.Object object ) 
-                throws IllegalStateException
-            {
-                User target = (User) object;
-                return target.getData();
-            }
-            public void setValue( java.lang.Object object, java.lang.Object value) 
-                throws IllegalStateException, IllegalArgumentException
-            {
-                try {
-                    User target = (User) object;
-                    target.setData( (java.lang.String) value);
-                }
-                catch (java.lang.Exception ex) {
-                    throw new IllegalStateException(ex.toString());
-                }
-            }
-            public java.lang.Object newInstance( java.lang.Object parent ) {
-                return null;
-            }
-        };
-        desc.setHandler(handler);
-        desc.setMultivalued(false);
-        addFieldDescriptor(desc);
-        
-        //-- validation code for: _data
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
+        fieldValidator.setMinOccurs(1);
         { //-- local scope
             StringValidator typeValidator = new StringValidator();
             typeValidator.setWhiteSpace("preserve");
@@ -204,7 +172,7 @@ public class UserDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto
      */
     public org.exolab.castor.mapping.ClassDescriptor getExtends()
     {
-        return null;
+        return super.getExtends();
     } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
 
     /**
@@ -216,6 +184,8 @@ public class UserDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto
      */
     public org.exolab.castor.mapping.FieldDescriptor getIdentity()
     {
+        if (identity == null)
+            return super.getIdentity();
         return identity;
     } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity()