AlignmentAnnotations require id

diff --git a/schemas/vamsas.xsd b/schemas/vamsas.xsd
index aeb9ee3..5ee50eb 100755 (executable)
--- a/schemas/vamsas.xsd
+++ b/schemas/vamsas.xsd
@@ -46,6 +46,7 @@
                                                <xs:attribute name="sequenceRef" type="xs:string" use="optional"/>\r
                                                <xs:attribute name="graphColour" type="xs:int" use="optional"/>\r
                                                <xs:attribute name="graphGroup" type="xs:int" use="optional"/>\r
+                                               <xs:attribute name="id" type="xs:string" use="optional"/>\r
                                        </xs:complexType>\r
                                </xs:element>\r
                        </xs:sequence>\r

diff --git a/src/jalview/schemabinding/version2/Annotation.java b/src/jalview/schemabinding/version2/Annotation.java
index ec9b84c..61f9413 100755 (executable)
--- a/src/jalview/schemabinding/version2/Annotation.java
+++ b/src/jalview/schemabinding/version2/Annotation.java
@@ -81,6 +81,11 @@ public class Annotation implements java.io.Serializable {
     private boolean _has_graphGroup;\r
 \r
     /**\r
+     * Field _id\r
+     */\r
+    private java.lang.String _id;\r
+\r
+    /**\r
      * Field _annotationElementList\r
      */\r
     private java.util.Vector _annotationElementList;\r
@@ -294,6 +299,17 @@ public class Annotation implements java.io.Serializable {
     } //-- int getGraphType() \r
 \r
     /**\r
+     * Returns the value of field 'id'.\r
+     * \r
+     * @return String\r
+     * @return the value of field 'id'.\r
+     */\r
+    public java.lang.String getId()\r
+    {\r
+        return this._id;\r
+    } //-- java.lang.String getId() \r
+\r
+    /**\r
      * Returns the value of field 'label'.\r
      * \r
      * @return String\r
@@ -533,6 +549,16 @@ public class Annotation implements java.io.Serializable {
     } //-- void setGraphType(int) \r
 \r
     /**\r
+     * Sets the value of field 'id'.\r
+     * \r
+     * @param id the value of field 'id'.\r
+     */\r
+    public void setId(java.lang.String id)\r
+    {\r
+        this._id = id;\r
+    } //-- void setId(java.lang.String) \r
+\r
+    /**\r
      * Sets the value of field 'label'.\r
      * \r
      * @param label the value of field 'label'.\r

diff --git a/src/jalview/schemabinding/version2/AnnotationDescriptor.java b/src/jalview/schemabinding/version2/AnnotationDescriptor.java
index b2290fe..34047b3 100755 (executable)
--- a/src/jalview/schemabinding/version2/AnnotationDescriptor.java
+++ b/src/jalview/schemabinding/version2/AnnotationDescriptor.java
@@ -265,6 +265,42 @@ public class AnnotationDescriptor extends org.exolab.castor.xml.util.XMLClassDes
             fieldValidator.setValidator(typeValidator);\r
         }\r
         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
+        desc.setImmutable(true);\r
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {\r
+            public java.lang.Object getValue( java.lang.Object object ) \r
+                throws IllegalStateException\r
+            {\r
+                Annotation target = (Annotation) object;\r
+                return target.getId();\r
+            }\r
+            public void setValue( java.lang.Object object, java.lang.Object value) \r
+                throws IllegalStateException, IllegalArgumentException\r
+            {\r
+                try {\r
+                    Annotation target = (Annotation) object;\r
+                    target.setId( (java.lang.String) value);\r
+                }\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 null;\r
+            }\r
+        } );\r
+        desc.setHandler(handler);\r
+        addFieldDescriptor(desc);\r
+        \r
+        //-- validation code for: _id\r
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();\r
+        { //-- local scope\r
+            StringValidator typeValidator = new StringValidator();\r
+            typeValidator.setWhiteSpace("preserve");\r
+            fieldValidator.setValidator(typeValidator);\r
+        }\r
+        desc.setValidator(fieldValidator);\r
         //-- initialize element descriptors\r
         \r
         //-- _annotationElementList\r