X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=schemas%2Fjalview.xsd;h=4ab3160642f8ac3d29394aeced827378a26ff231;hb=38086bb11e3db63ddea8a9805f813d21668d7e8f;hp=77d701c8d29a39675d8c5d3fee72b4270bc9a7f5;hpb=37c1bc52d964f50df6604d50a381a8f5dae8a5aa;p=jalview.git

diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd
index 77d701c..4ab3160 100755
--- a/schemas/jalview.xsd
+++ b/schemas/jalview.xsd
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
 			xmlns:vamsas="www.vamsas.org" 
-			xmlns:jalview="www.jalview.org" 
+			xmlns:jalview="www.jalview.org/colours" 
 			targetNamespace="www.jalview.org" 
 			elementFormDefault="qualified" 
 			attributeFormDefault="unqualified">
 
 <xs:import schemaLocation="vamsas.xsd" namespace="www.vamsas.org" />
+<xs:import schemaLocation="jalviewUserColours.xsd" namespace="www.jalview.org/colours"/>
 
 <xs:complexType name="JalviewModel">
 
     <xs:sequence>
 
 	    <xs:element name="creationDate" type="xs:dateTime"/>
+	    
+	    <xs:element name="version" type="xs:string"/>
 
         <xs:element name="vamsasModel" type="vamsas:VAMSAS"/>
 
@@ -34,7 +37,7 @@
 
             </xs:element>
 
-            <xs:element name="JGroup" maxOccurs="unbounded">
+            <xs:element name="JGroup" minOccurs="0" maxOccurs="unbounded">
 
                 <xs:complexType>
 
@@ -122,9 +125,39 @@
 
                 </xs:complexType>
 
-            </xs:element>
+            </xs:element>        
+            
 
-        </xs:sequence>
+			<xs:element name="UserColours" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>  
+					 <xs:sequence minOccurs="1">
+					 	<xs:element name="UserColourScheme" type="jalview:JalviewUserColours"/>
+					 </xs:sequence>
+					 <xs:attribute name="id" type="xs:string"/>
+                 </xs:complexType>
+            </xs:element>
+            
+               			<xs:element name="tree" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>  
+					 <xs:sequence minOccurs="0" maxOccurs="1">
+					    <xs:element name="title" type="xs:string"/>
+					 	<xs:element name="newick" type="xs:string"/>
+					 </xs:sequence>
+					 <xs:attribute name="width" type="xs:int"/>
+					  <xs:attribute name="height" type="xs:int"/>
+					   <xs:attribute name="xpos" type="xs:int"/>
+					    <xs:attribute name="ypos" type="xs:int"/>
+					  <xs:attribute name="fontSize" type="xs:int"/>
+					  <xs:attribute name="threshold" type="xs:float"/>
+					 <xs:attribute name="showBootstrap" type="xs:boolean"/>
+					 <xs:attribute name="showDistances" type="xs:boolean"/>
+					 <xs:attribute name="markUnlinked" type="xs:boolean"/>
+					 <xs:attribute name="fitToWindow" type="xs:boolean"/>
+					 <xs:attribute name="currentTree" type="xs:boolean"/>
+                 </xs:complexType>
+            </xs:element>     
+
+	</xs:sequence>
 
     </xs:sequence>