From ef1213b248ff729d9038537edc877e4fc09479ae Mon Sep 17 00:00:00 2001
From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 18 Sep 2018 16:00:20 +0100
Subject: [PATCH] JAL-3063 tweak schema so JAXB generates enums for enumerated
 values

---
 schemas/JalviewUserColours.xsd |   46 +++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/schemas/JalviewUserColours.xsd b/schemas/JalviewUserColours.xsd
index 3934d66..73e6aff 100755
--- a/schemas/JalviewUserColours.xsd
+++ b/schemas/JalviewUserColours.xsd
@@ -43,15 +43,7 @@
 					<xs:attribute name="RGB" type="xs:string" use="required"/>
 					<xs:attribute name="minRGB" type="xs:string" use="optional"/>
 					<xs:attribute name="noValueColour" use="optional" type="jalview:NoValueColour" default="Min" />
-					<xs:attribute name="threshType" use="optional">
-						<xs:simpleType> 
-							<xs:restriction base="xs:string">
-						      <xs:enumeration value="NONE" />
-						      <xs:enumeration value="ABOVE" />
-						      <xs:enumeration value="BELOW" />
-						    </xs:restriction>	
-					    </xs:simpleType> 
-					</xs:attribute>
+					<xs:attribute name="threshType" use="optional" type="jalview:ThresholdType" />
 					<xs:attribute name="threshold" type="xs:float" use="optional"/>
 					<xs:attribute name="max" type="xs:float" use="optional"/>
 					<xs:attribute name="min" type="xs:float" use="optional"/>
@@ -102,16 +94,32 @@
 	    <xs:element name="condition" type="xs:string" /> 
 	    <xs:element name="value" type="xs:string" /> 
 	  </xs:sequence>
-	  <xs:attribute name="by">
-		<xs:simpleType> 
-			<xs:restriction base="xs:string">
-		      <xs:enumeration value="byLabel" />
-		      <xs:enumeration value="byScore" />
-		      <xs:enumeration value="byAttribute" />
-		    </xs:restriction>	
-	    </xs:simpleType> 
-	  </xs:attribute> 
-	</xs:complexType> 
+	  <xs:attribute name="by" type="jalview:FilterBy" />
+	</xs:complexType>
+
+	<xs:simpleType name="ThresholdType">
+		<xs:annotation>
+			<xs:documentation>Whether filter has a threshold, and if so is it
+				above or below
+			</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="NONE" />
+			<xs:enumeration value="ABOVE" />
+			<xs:enumeration value="BELOW" />
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:simpleType name="FilterBy">
+	    	<xs:annotation>
+	    		<xs:documentation>Filter may apply to label, score or some feature attribute</xs:documentation>
+	    	</xs:annotation>
+		<xs:restriction base="xs:string">
+	      <xs:enumeration value="byLabel" />
+	      <xs:enumeration value="byScore" />
+	      <xs:enumeration value="byAttribute" />
+	    </xs:restriction>	
+	</xs:simpleType>
 	
 	<xs:simpleType name="NoValueColour">
 	    	<xs:annotation>
-- 
1.7.10.2