X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fuk%2Fac%2Fvamsas%2Fobjects%2Fcore%2Fdescriptors%2FDbRefDescriptor.java;h=ef04791b51d429bb0bc5ef12fa19b76d20fba0bb;hb=1890f014c0a312a7a2203c878e4802e3eb914e47;hp=762b51a29553ac30327ece8a1915efa426e63dfb;hpb=de558440c776d39285b02d970a21df7002e85a3c;p=vamsas.git

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