usercolours added

diff --git a/schemas/JalviewState.xsd b/schemas/JalviewState.xsd
deleted file mode 100755 (executable)
index e0274c6..0000000
--- a/schemas/JalviewState.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="www.jalview.org">\r
-    <xs:complexType name="JalviewState">\r
-        <xs:sequence>\r
-            <xs:element name="creationDate" type="xs:dateTime"/>\r
-            <xs:element name="file" maxOccurs="unbounded" type="xs:string"/>\r
-        </xs:sequence>\r
-    </xs:complexType>\r
-</xs:schema>
\ No newline at end of file

diff --git a/schemas/JalviewUserColours.xsd b/schemas/JalviewUserColours.xsd
new file mode 100755 (executable)
index 0000000..5db1d8b
--- /dev/null
+++ b/schemas/JalviewUserColours.xsd
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!-- edited with XMLSpy v2005 rel. 3 U (http://www.altova.com) by lj (jl) -->\r
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="www.jalview.org/colours">\r
+       <xs:complexType name="JalviewUserColours">\r
+               <xs:sequence>\r
+                       <xs:element name="colour" maxOccurs="unbounded">\r
+                               <xs:complexType>\r
+                                       <xs:attribute name="Name" type="xs:string"/>\r
+                                       <xs:attribute name="RGB" type="xs:string" use="required"/>\r
+                               </xs:complexType>\r
+                       </xs:element>\r
+               </xs:sequence>\r
+       </xs:complexType>\r
+</xs:schema>\r

diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd
index 77d701c..65c7422 100755 (executable)
--- a/schemas/jalview.xsd
+++ b/schemas/jalview.xsd
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" \r
                        xmlns:vamsas="www.vamsas.org" \r
-                       xmlns:jalview="www.jalview.org" \r
+                       xmlns:jalview="www.jalview.org/colours" \r
                        targetNamespace="www.jalview.org" \r
                        elementFormDefault="qualified" \r
                        attributeFormDefault="unqualified">\r
 \r
 <xs:import schemaLocation="vamsas.xsd" namespace="www.vamsas.org" />\r
+<xs:import schemaLocation="jalviewUserColours.xsd" namespace="www.jalview.org/colours"/>\r
 \r
 <xs:complexType name="JalviewModel">\r
 \r
@@ -122,9 +123,18 @@
 \r
                 </xs:complexType>\r
 \r
+            </xs:element>    \r
+\r
+                       <xs:element name="UserColours" maxOccurs="unbounded">\r
+                <xs:complexType>  \r
+                                        <xs:sequence minOccurs="1">\r
+                                               <xs:element name="UserColourScheme" type="jalview:JalviewUserColours"/>\r
+                                        </xs:sequence>\r
+                                        <xs:attribute name="id" type="xs:string"/>\r
+                 </xs:complexType>\r
             </xs:element>\r
 \r
-        </xs:sequence>\r
+       </xs:sequence>\r
 \r
     </xs:sequence>\r
 \r