Simplified layout

diff --git a/schemas/vamsas.xsd b/schemas/vamsas.xsd
index fc1193f..f73c01b 100755 (executable)
--- a/schemas/vamsas.xsd
+++ b/schemas/vamsas.xsd
@@ -3,34 +3,6 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vamsas="www.vamsas.ac.uk/jalview/version2" targetNamespace="www.vamsas.ac.uk/jalview/version2" elementFormDefault="qualified" attributeFormDefault="unqualified">\r
        <xs:complexType name="VAMSAS">\r
                <xs:sequence>\r
-                       <xs:element name="Alignment" minOccurs="0" maxOccurs="unbounded">\r
-                               <xs:complexType>\r
-                                       <xs:sequence>\r
-                                               <xs:element name="Annotation" minOccurs="0">\r
-                                                       <xs:complexType>\r
-                                                               <xs:sequence>\r
-                                                                       <xs:element ref="vamsas:annotationElement" minOccurs="0" maxOccurs="unbounded"/>\r
-                                                                       <xs:element name="label" type="xs:string"/>\r
-                                                                       <xs:element name="description" type="xs:string" minOccurs="0"/>\r
-                                                                       <xs:element name="thresholdLine" minOccurs="0">\r
-                                                                               <xs:complexType>\r
-                                                                                       <xs:attribute name="label" type="xs:string"/>\r
-                                                                                       <xs:attribute name="value" type="xs:float"/>\r
-                                                                                       <xs:attribute name="colour" type="xs:int"/>\r
-                                                                               </xs:complexType>\r
-                                                                       </xs:element>\r
-                                                               </xs:sequence>\r
-                                                               <xs:attribute name="graph" type="xs:boolean" use="required"/>\r
-                                                               <xs:attribute name="graphType" type="xs:int" use="optional"/>\r
-                                                               <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:complexType>\r
-                                               </xs:element>\r
-                                               <xs:element ref="vamsas:SequenceSet"/>\r
-                                       </xs:sequence>\r
-                               </xs:complexType>\r
-                       </xs:element>\r
                        <xs:element name="Tree" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
                        <xs:element ref="vamsas:SequenceSet" minOccurs="0" maxOccurs="unbounded"/>\r
                </xs:sequence>\r
@@ -58,14 +30,22 @@
                                <xs:element name="Annotation" minOccurs="0" maxOccurs="unbounded">\r
                                        <xs:complexType>\r
                                                <xs:sequence>\r
-                                                       <xs:element name="description" type="xs:string" minOccurs="0"/>\r
-                                                       <xs:element name="status" type="xs:string" minOccurs="0"/>\r
                                                        <xs:element ref="vamsas:annotationElement" minOccurs="0" maxOccurs="unbounded"/>\r
+                                                       <xs:element name="label" type="xs:string"/>\r
+                                                       <xs:element name="description" type="xs:string" minOccurs="0"/>\r
+                                                       <xs:element name="thresholdLine" minOccurs="0">\r
+                                                               <xs:complexType>\r
+                                                                       <xs:attribute name="label" type="xs:string"/>\r
+                                                                       <xs:attribute name="value" type="xs:float"/>\r
+                                                                       <xs:attribute name="colour" type="xs:int"/>\r
+                                                               </xs:complexType>\r
+                                                       </xs:element>\r
                                                </xs:sequence>\r
-                                               <xs:attribute name="type" type="xs:string" use="required"/>\r
-                                               <xs:attribute name="end" type="xs:string" use="required"/>\r
-                                               <xs:attribute name="begin" type="xs:string" use="required"/>\r
-                                               <xs:attribute name="seqRef" type="xs:string" use="required"/>\r
+                                               <xs:attribute name="graph" type="xs:boolean" use="required"/>\r
+                                               <xs:attribute name="graphType" type="xs:int" use="optional"/>\r
+                                               <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:complexType>\r
                                </xs:element>\r
                        </xs:sequence>\r