JAL-1620 version bump and release notes

[jalview.git] / schemas / jalview.xsd

diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd
index 5631def..3389835 100755 (executable)
--- 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.2b1)
  * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
@@ -27,7 +27,7 @@
                        <xs:element name="version" type="xs:string" />
                        <xs:element name="vamsasModel" type="vamsas:VAMSAS" />
                        <xs:sequence>
-                               <xs:element name="JSeq" maxOccurs="unbounded">
+                               <xs:element name="JSeq" maxOccurs="unbounded" minOccurs="0">
                                        <xs:complexType>
                                                <xs:sequence>
                                                        <xs:element name="features"
@@ -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" />
@@ -275,31 +276,11 @@
                                                </xs:attribute>
                                        </xs:complexType>
                                </xs:element>
-                               <xs:element name="Viewport" maxOccurs="unbounded">
+                               <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>