From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 15 Sep 2006 14:38:45 +0000 (+0000)
Subject: Simplified layout
X-Git-Tag: Release_2_2~339
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7418f2aca1d88b04abebcce7940006e202c5f19c;p=jalview.git

Simplified layout
---

diff --git a/schemas/vamsas.xsd b/schemas/vamsas.xsd
index fc1193f..f73c01b 100755
--- 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">
 	<xs:complexType name="VAMSAS">
 		<xs:sequence>
-			<xs:element name="Alignment" minOccurs="0" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Annotation" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:element ref="vamsas:annotationElement" minOccurs="0" maxOccurs="unbounded"/>
-									<xs:element name="label" type="xs:string"/>
-									<xs:element name="description" type="xs:string" minOccurs="0"/>
-									<xs:element name="thresholdLine" minOccurs="0">
-										<xs:complexType>
-											<xs:attribute name="label" type="xs:string"/>
-											<xs:attribute name="value" type="xs:float"/>
-											<xs:attribute name="colour" type="xs:int"/>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-								<xs:attribute name="graph" type="xs:boolean" use="required"/>
-								<xs:attribute name="graphType" type="xs:int" use="optional"/>
-								<xs:attribute name="sequenceRef" type="xs:string" use="optional"/>
-								<xs:attribute name="graphColour" type="xs:int" use="optional"/>
-								<xs:attribute name="graphGroup" type="xs:int" use="optional"/>
-							</xs:complexType>
-						</xs:element>
-						<xs:element ref="vamsas:SequenceSet"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
 			<xs:element name="Tree" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element ref="vamsas:SequenceSet" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
@@ -58,14 +30,22 @@
 				<xs:element name="Annotation" minOccurs="0" maxOccurs="unbounded">
 					<xs:complexType>
 						<xs:sequence>
-							<xs:element name="description" type="xs:string" minOccurs="0"/>
-							<xs:element name="status" type="xs:string" minOccurs="0"/>
 							<xs:element ref="vamsas:annotationElement" minOccurs="0" maxOccurs="unbounded"/>
+							<xs:element name="label" type="xs:string"/>
+							<xs:element name="description" type="xs:string" minOccurs="0"/>
+							<xs:element name="thresholdLine" minOccurs="0">
+								<xs:complexType>
+									<xs:attribute name="label" type="xs:string"/>
+									<xs:attribute name="value" type="xs:float"/>
+									<xs:attribute name="colour" type="xs:int"/>
+								</xs:complexType>
+							</xs:element>
 						</xs:sequence>
-						<xs:attribute name="type" type="xs:string" use="required"/>
-						<xs:attribute name="end" type="xs:string" use="required"/>
-						<xs:attribute name="begin" type="xs:string" use="required"/>
-						<xs:attribute name="seqRef" type="xs:string" use="required"/>
+						<xs:attribute name="graph" type="xs:boolean" use="required"/>
+						<xs:attribute name="graphType" type="xs:int" use="optional"/>
+						<xs:attribute name="sequenceRef" type="xs:string" use="optional"/>
+						<xs:attribute name="graphColour" type="xs:int" use="optional"/>
+						<xs:attribute name="graphGroup" type="xs:int" use="optional"/>
 					</xs:complexType>
 				</xs:element>
 			</xs:sequence>