X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=schemas%2Fjalview.xsd;h=3fdf20c8b408dac477d9fa99cd01870b30c265f0;hb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;hp=0138f6332ca02f293b928287ab93d8f1eb2d78bc;hpb=f2ae865457eea8f0bd3bf3dd0be853c56583544a;p=jalview.git

diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd
index 0138f63..3fdf20c 100755
--- a/schemas/jalview.xsd
+++ b/schemas/jalview.xsd
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
-  Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
-  
-  This file is part of Jalview.
-  
-  Jalview is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License 
-  as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-   
-  Jalview is distributed in the hope that it will be useful, but 
-  WITHOUT ANY WARRANTY; without even the implied warranty 
-  of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
-  PURPOSE.  See the GNU General Public License for more details.
-  
-  You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Copyright (C) 2014 The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vamsas="www.vamsas.ac.uk/jalview/version2" xmlns:jalview="www.jalview.org/colours" xmlns:jv="www.jalview.org" xmlns:jvws="www.jalview.org/xml/wsparamset" targetNamespace="www.jalview.org" elementFormDefault="qualified" attributeFormDefault="unqualified">
 		<xs:import namespace="www.vamsas.ac.uk/jalview/version2" schemaLocation="vamsas.xsd"/>
@@ -26,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"
@@ -229,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" />
@@ -274,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">
@@ -572,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>