X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fuk%2Fac%2Fvamsas%2Fobjects%2Fcore%2Fdescriptors%2FSequenceDescriptor.java;h=d18b8c122dcc0749fad5e049d079103952e6bf60;hb=4aeaba257ad7e3206158565b356da7e4b15bf0a2;hp=2cf4e0153dd11972e483597472d8bc6302c25414;hpb=ac12127b5cf22bb34b6042e543d506894164a94c;p=vamsas.git diff --git a/src/uk/ac/vamsas/objects/core/descriptors/SequenceDescriptor.java b/src/uk/ac/vamsas/objects/core/descriptors/SequenceDescriptor.java index 2cf4e01..d18b8c1 100644 --- a/src/uk/ac/vamsas/objects/core/descriptors/SequenceDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/descriptors/SequenceDescriptor.java @@ -45,11 +45,6 @@ public class SequenceDescriptor extends uk.ac.vamsas.objects.core.descriptors.Se */ private java.lang.String _xmlName; - /** - * Field _identity. - */ - private org.exolab.castor.xml.XMLFieldDescriptor _identity; - //----------------/ //- Constructors -/ @@ -71,7 +66,7 @@ public class SequenceDescriptor extends uk.ac.vamsas.objects.core.descriptors.Se //-- _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 @@ -188,6 +183,48 @@ public class SequenceDescriptor extends uk.ac.vamsas.objects.core.descriptors.Se { //-- local scope } desc.setValidator(fieldValidator); + //-- _vxrefList + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Vxref.class, "_vxrefList", "vxref", org.exolab.castor.xml.NodeType.Element); + handler = new org.exolab.castor.xml.XMLFieldHandler() { + public java.lang.Object getValue( java.lang.Object object ) + throws IllegalStateException + { + Sequence target = (Sequence) object; + return target.getVxref(); + } + public void setValue( java.lang.Object object, java.lang.Object value) + throws IllegalStateException, IllegalArgumentException + { + try { + Sequence target = (Sequence) object; + target.addVxref( (uk.ac.vamsas.objects.core.Vxref) value); + } catch (java.lang.Exception ex) { + throw new IllegalStateException(ex.toString()); + } + } + public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + try { + Sequence target = (Sequence) object; + target.removeAllVxref(); + } catch (java.lang.Exception ex) { + throw new IllegalStateException(ex.toString()); + } + } + public java.lang.Object newInstance(java.lang.Object parent) { + return new uk.ac.vamsas.objects.core.Vxref(); + } + }; + desc.setHandler(handler); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); + desc.setMultivalued(true); + addFieldDescriptor(desc); + + //-- validation code for: _vxrefList + fieldValidator = new org.exolab.castor.xml.FieldValidator(); + fieldValidator.setMinOccurs(0); + { //-- local scope + } + desc.setValidator(fieldValidator); } @@ -213,10 +250,7 @@ public class SequenceDescriptor extends uk.ac.vamsas.objects.core.descriptors.Se */ public org.exolab.castor.mapping.FieldDescriptor getIdentity( ) { - if (_identity == null) { - return super.getIdentity(); - } - return _identity; + return super.getIdentity(); } /**