Has version, Groups are optional, trees added to schema

diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd
index 65c7422..4ab3160 100755 (executable)
--- a/schemas/jalview.xsd
+++ b/schemas/jalview.xsd
@@ -14,6 +14,8 @@
     <xs:sequence>\r
 \r
            <xs:element name="creationDate" type="xs:dateTime"/>\r
+           \r
+           <xs:element name="version" type="xs:string"/>\r
 \r
         <xs:element name="vamsasModel" type="vamsas:VAMSAS"/>\r
 \r
@@ -35,7 +37,7 @@
 \r
             </xs:element>\r
 \r
-            <xs:element name="JGroup" maxOccurs="unbounded">\r
+            <xs:element name="JGroup" minOccurs="0" maxOccurs="unbounded">\r
 \r
                 <xs:complexType>\r
 \r
@@ -123,9 +125,10 @@
 \r
                 </xs:complexType>\r
 \r
-            </xs:element>    \r
+            </xs:element>        \r
+            \r
 \r
-                       <xs:element name="UserColours" maxOccurs="unbounded">\r
+                       <xs:element name="UserColours" minOccurs="0" maxOccurs="unbounded">\r
                 <xs:complexType>  \r
                                         <xs:sequence minOccurs="1">\r
                                                <xs:element name="UserColourScheme" type="jalview:JalviewUserColours"/>\r
@@ -133,6 +136,26 @@
                                         <xs:attribute name="id" type="xs:string"/>\r
                  </xs:complexType>\r
             </xs:element>\r
+            \r
+                                       <xs:element name="tree" minOccurs="0" maxOccurs="unbounded">\r
+                <xs:complexType>  \r
+                                        <xs:sequence minOccurs="0" maxOccurs="1">\r
+                                           <xs:element name="title" type="xs:string"/>\r
+                                               <xs:element name="newick" type="xs:string"/>\r
+                                        </xs:sequence>\r
+                                        <xs:attribute name="width" type="xs:int"/>\r
+                                         <xs:attribute name="height" type="xs:int"/>\r
+                                          <xs:attribute name="xpos" type="xs:int"/>\r
+                                           <xs:attribute name="ypos" type="xs:int"/>\r
+                                         <xs:attribute name="fontSize" type="xs:int"/>\r
+                                         <xs:attribute name="threshold" type="xs:float"/>\r
+                                        <xs:attribute name="showBootstrap" type="xs:boolean"/>\r
+                                        <xs:attribute name="showDistances" type="xs:boolean"/>\r
+                                        <xs:attribute name="markUnlinked" type="xs:boolean"/>\r
+                                        <xs:attribute name="fitToWindow" type="xs:boolean"/>\r
+                                        <xs:attribute name="currentTree" type="xs:boolean"/>\r
+                 </xs:complexType>\r
+            </xs:element>     \r
 \r
        </xs:sequence>\r
 \r