X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=schemas%2Fjalview.xsd;h=27f952dd637317f4c7baf90d6a5d5034c184c21e;hb=bde9f99880a7fc3a9574447ac0860f56d06d9cab;hp=eb10ae1fab1089abc9c805d7a87529563c28b1ab;hpb=985f0371b8ea6b3dbb4e1b77d67bba7f7f180b28;p=jalview.git

diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd
index eb10ae1..27f952d 100755
--- a/schemas/jalview.xsd
+++ b/schemas/jalview.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
  * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
@@ -230,9 +230,10 @@
 				<xs:element name="JGroup" minOccurs="0"
 					maxOccurs="unbounded">
 					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="seq" type="xs:string"
-								maxOccurs="unbounded" />
+            <xs:sequence>
+							<xs:element name="seq" type="xs:string" maxOccurs="unbounded" />
+							<xs:element name="annotationColours" type="jv:AnnotationColourScheme"
+								minOccurs="0" maxOccurs="1" />
 						</xs:sequence>
 						<xs:attribute name="start" type="xs:int" />
 						<xs:attribute name="end" type="xs:int" />
@@ -278,28 +279,8 @@
 				<xs:element name="Viewport" maxOccurs="unbounded" minOccurs="0">
 					<xs:complexType>
 						<xs:sequence>
-							<xs:element name="AnnotationColours"
-								minOccurs="0">
-								<xs:complexType>
-									<xs:attribute name="aboveThreshold"
-										type="xs:int" />
-									<xs:attribute name="annotation"
-										type="xs:string" />
-									<xs:attribute name="minColour"
-										type="xs:int" />
-									<xs:attribute name="maxColour"
-										type="xs:int" />
-									<xs:attribute name="colourScheme"
-										type="xs:string" />
-									<xs:attribute name="threshold"
-										type="xs:float" />
-	                <xs:attribute name="perSequence" 
-	                type="xs:boolean" 
-	                use="optional" />
-	                <xs:attribute name="predefinedColours" 
-                  type="xs:boolean" 
-                  use="optional" />
-								</xs:complexType>
+							<xs:element name="AnnotationColours" type="jv:AnnotationColourScheme" 
+								minOccurs="0" maxOccurs="1">
 							</xs:element>
 							<xs:element name="hiddenColumns"
 								minOccurs="0" maxOccurs="unbounded">
@@ -573,4 +554,16 @@
       <xs:attribute name="xpos" type="xs:int"/>
       <xs:attribute name="ypos" type="xs:int"/>
     </xs:attributeGroup>
+  <xs:complexType name="AnnotationColourScheme">
+	<xs:attribute name="aboveThreshold" type="xs:int" />
+	<xs:attribute name="annotation" type="xs:string" />
+	<xs:attribute name="minColour" type="xs:int" />
+	<xs:attribute name="maxColour" type="xs:int" />
+	<xs:attribute name="colourScheme" type="xs:string" />
+	<xs:attribute name="threshold" type="xs:float" />
+	<xs:attribute name="perSequence" type="xs:boolean" use="optional" />
+	<xs:attribute name="predefinedColours" type="xs:boolean"
+		use="optional" />
+  </xs:complexType>
+  
 </xs:schema>