sequence mappings and DbRef mapping objects unified and source binding for castor...

[vamsas.git] / src / uk / ac / vamsas / objects / core / descriptors / DbRefDescriptor.java

diff --git a/src/uk/ac/vamsas/objects/core/descriptors/DbRefDescriptor.java b/src/uk/ac/vamsas/objects/core/descriptors/DbRefDescriptor.java
index 762b51a..ef04791 100644 (file)
--- a/src/uk/ac/vamsas/objects/core/descriptors/DbRefDescriptor.java
+++ b/src/uk/ac/vamsas/objects/core/descriptors/DbRefDescriptor.java
@@ -45,11 +45,6 @@ public class DbRefDescriptor extends org.exolab.castor.xml.util.XMLClassDescript
      */\r
     private java.lang.String _xmlName;\r
 \r
-    /**\r
-     * Field _identity.\r
-     */\r
-    private org.exolab.castor.xml.XMLFieldDescriptor _identity;\r
-\r
 \r
       //----------------/\r
      //- Constructors -/\r
@@ -187,7 +182,7 @@ public class DbRefDescriptor extends org.exolab.castor.xml.util.XMLClassDescript
         desc.setValidator(fieldValidator);\r
         //-- _id\r
         desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_id", "id", org.exolab.castor.xml.NodeType.Attribute);\r
-        this._identity = desc;\r
+        super.setIdentity(desc);\r
         handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
             public java.lang.Object getValue( java.lang.Object object ) \r
                 throws IllegalStateException\r
@@ -223,8 +218,8 @@ public class DbRefDescriptor extends org.exolab.castor.xml.util.XMLClassDescript
         desc.setValidator(fieldValidator);\r
         //-- initialize element descriptors\r
         \r
-        //-- _mapList\r
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Map.class, "_mapList", "map", org.exolab.castor.xml.NodeType.Element);\r
+        //-- _map\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Map.class, "_map", "map", org.exolab.castor.xml.NodeType.Element);\r
         handler = new org.exolab.castor.xml.XMLFieldHandler() {\r
             public java.lang.Object getValue( java.lang.Object object ) \r
                 throws IllegalStateException\r
@@ -237,15 +232,7 @@ public class DbRefDescriptor extends org.exolab.castor.xml.util.XMLClassDescript
             {\r
                 try {\r
                     DbRef target = (DbRef) object;\r
-                    target.addMap( (uk.ac.vamsas.objects.core.Map) value);\r
-                } catch (java.lang.Exception ex) {\r
-                    throw new IllegalStateException(ex.toString());\r
-                }\r
-            }\r
-            public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException {\r
-                try {\r
-                    DbRef target = (DbRef) object;\r
-                    target.removeAllMap();\r
+                    target.setMap( (uk.ac.vamsas.objects.core.Map) value);\r
                 } catch (java.lang.Exception ex) {\r
                     throw new IllegalStateException(ex.toString());\r
                 }\r
@@ -256,12 +243,11 @@ public class DbRefDescriptor extends org.exolab.castor.xml.util.XMLClassDescript
         };\r
         desc.setHandler(handler);\r
         desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");\r
-        desc.setMultivalued(true);\r
+        desc.setMultivalued(false);\r
         addFieldDescriptor(desc);\r
         \r
-        //-- validation code for: _mapList\r
+        //-- validation code for: _map\r
         fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
-        fieldValidator.setMinOccurs(0);\r
         { //-- local scope\r
         }\r
         desc.setValidator(fieldValidator);\r
@@ -374,7 +360,7 @@ public class DbRefDescriptor extends org.exolab.castor.xml.util.XMLClassDescript
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r