moved methods for opening a stored session document in a new vamsas session into...

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

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 (file)
--- 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
      */\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
@@ -71,7 +66,7 @@ public class SequenceDescriptor extends uk.ac.vamsas.objects.core.descriptors.Se
         \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
@@ -188,6 +183,48 @@ public class SequenceDescriptor extends uk.ac.vamsas.objects.core.descriptors.Se
         { //-- local scope\r
         }\r
         desc.setValidator(fieldValidator);\r
+        //-- _vxrefList\r
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(uk.ac.vamsas.objects.core.Vxref.class, "_vxrefList", "vxref", 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
+            {\r
+                Sequence target = (Sequence) object;\r
+                return target.getVxref();\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Sequence target = (Sequence) object;\r
+                    target.addVxref( (uk.ac.vamsas.objects.core.Vxref) 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
+                    Sequence target = (Sequence) object;\r
+                    target.removeAllVxref();\r
+                } catch (java.lang.Exception ex) {\r
+                    throw new IllegalStateException(ex.toString());\r
+                }\r
+            }\r
+            public java.lang.Object newInstance(java.lang.Object parent) {\r
+                return new uk.ac.vamsas.objects.core.Vxref();\r
+            }\r
+        };\r
+        desc.setHandler(handler);\r
+        desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes");\r
+        desc.setMultivalued(true);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _vxrefList\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        fieldValidator.setMinOccurs(0);\r
+        { //-- local scope\r
+        }\r
+        desc.setValidator(fieldValidator);\r
     }\r
 \r
 \r
@@ -213,10 +250,7 @@ public class SequenceDescriptor extends uk.ac.vamsas.objects.core.descriptors.Se
      */\r
     public org.exolab.castor.mapping.FieldDescriptor getIdentity(\r
     ) {\r
-        if (_identity == null) {\r
-            return super.getIdentity();\r
-        }\r
-        return _identity;\r
+        return super.getIdentity();\r
     }\r
 \r
     /**\r