JAL-3063 top level element added to colours schema, JAXB classes regen'd

diff --git a/schemas/JalviewUserColours.xsd b/schemas/JalviewUserColours.xsd
index 73e6aff..d9923a8 100755 (executable)
--- a/schemas/JalviewUserColours.xsd
+++ b/schemas/JalviewUserColours.xsd
@@ -17,6 +17,7 @@
   You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jalview="www.jalview.org/colours" targetNamespace="www.jalview.org/colours">
+       <xs:element name="JalviewUserColours" type="jalview:JalviewUserColours" />
        <xs:complexType name="JalviewUserColours">
                <xs:sequence>
                        <xs:element name="Version" maxOccurs="1" minOccurs="0" type="xs:string">

diff --git a/src/jalview/xml/binding/jalview/AlcodonFrame.java b/src/jalview/xml/binding/jalview/AlcodonFrame.java
index f4e7d84..7a2a60f 100644 (file)
--- a/src/jalview/xml/binding/jalview/AlcodonFrame.java
+++ b/src/jalview/xml/binding/jalview/AlcodonFrame.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/Annotation.java b/src/jalview/xml/binding/jalview/Annotation.java
index 22f6674..555f89d 100644 (file)
--- a/src/jalview/xml/binding/jalview/Annotation.java
+++ b/src/jalview/xml/binding/jalview/Annotation.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/AnnotationColourScheme.java b/src/jalview/xml/binding/jalview/AnnotationColourScheme.java
index bcf3302..e15b889 100644 (file)
--- a/src/jalview/xml/binding/jalview/AnnotationColourScheme.java
+++ b/src/jalview/xml/binding/jalview/AnnotationColourScheme.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/AnnotationElement.java b/src/jalview/xml/binding/jalview/AnnotationElement.java
index dcee889..e884218 100644 (file)
--- a/src/jalview/xml/binding/jalview/AnnotationElement.java
+++ b/src/jalview/xml/binding/jalview/AnnotationElement.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/Feature.java b/src/jalview/xml/binding/jalview/Feature.java
index 1040636..1f731d4 100644 (file)
--- a/src/jalview/xml/binding/jalview/Feature.java
+++ b/src/jalview/xml/binding/jalview/Feature.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/FeatureMatcher.java b/src/jalview/xml/binding/jalview/FeatureMatcher.java
index 3f3d812..85a85e0 100644 (file)
--- a/src/jalview/xml/binding/jalview/FeatureMatcher.java
+++ b/src/jalview/xml/binding/jalview/FeatureMatcher.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/FeatureMatcherSet.java b/src/jalview/xml/binding/jalview/FeatureMatcherSet.java
index f33d379..d69ae54 100644 (file)
--- a/src/jalview/xml/binding/jalview/FeatureMatcherSet.java
+++ b/src/jalview/xml/binding/jalview/FeatureMatcherSet.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/FilterBy.java b/src/jalview/xml/binding/jalview/FilterBy.java
index 7877175..76d7e03 100644 (file)
--- a/src/jalview/xml/binding/jalview/FilterBy.java
+++ b/src/jalview/xml/binding/jalview/FilterBy.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/JalviewModel.java b/src/jalview/xml/binding/jalview/JalviewModel.java
index 9cc7d80..b6c9034 100644 (file)
--- a/src/jalview/xml/binding/jalview/JalviewModel.java
+++ b/src/jalview/xml/binding/jalview/JalviewModel.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/JalviewUserColours.java b/src/jalview/xml/binding/jalview/JalviewUserColours.java
index b6f6b83..a97856b 100644 (file)
--- a/src/jalview/xml/binding/jalview/JalviewUserColours.java
+++ b/src/jalview/xml/binding/jalview/JalviewUserColours.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/MapListType.java b/src/jalview/xml/binding/jalview/MapListType.java
index 8e5f553..6abc8ae 100644 (file)
--- a/src/jalview/xml/binding/jalview/MapListType.java
+++ b/src/jalview/xml/binding/jalview/MapListType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/Mapping.java b/src/jalview/xml/binding/jalview/Mapping.java
index da64ed2..ed4f973 100644 (file)
--- a/src/jalview/xml/binding/jalview/Mapping.java
+++ b/src/jalview/xml/binding/jalview/Mapping.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/NoValueColour.java b/src/jalview/xml/binding/jalview/NoValueColour.java
index 9bce64b..7ceec80 100644 (file)
--- a/src/jalview/xml/binding/jalview/NoValueColour.java
+++ b/src/jalview/xml/binding/jalview/NoValueColour.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/ObjectFactory.java b/src/jalview/xml/binding/jalview/ObjectFactory.java
index 3b9cae3..2c8d513 100644 (file)
--- a/src/jalview/xml/binding/jalview/ObjectFactory.java
+++ b/src/jalview/xml/binding/jalview/ObjectFactory.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 
@@ -32,6 +32,7 @@ import javax.xml.namespace.QName;
 public class ObjectFactory {
 
     private final static QName _JalviewModel_QNAME = new QName("www.jalview.org", "JalviewModel");
+    private final static QName _JalviewUserColours_QNAME = new QName("www.jalview.org/colours", "JalviewUserColours");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: jalview.xml.binding.jalview
@@ -401,4 +402,13 @@ public class ObjectFactory {
         return new JAXBElement<JalviewModel>(_JalviewModel_QNAME, JalviewModel.class, null, value);
     }
 
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link JalviewUserColours }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "www.jalview.org/colours", name = "JalviewUserColours")
+    public JAXBElement<JalviewUserColours> createJalviewUserColours(JalviewUserColours value) {
+        return new JAXBElement<JalviewUserColours>(_JalviewUserColours_QNAME, JalviewUserColours.class, null, value);
+    }
+
 }

diff --git a/src/jalview/xml/binding/jalview/Pdbentry.java b/src/jalview/xml/binding/jalview/Pdbentry.java
index acb0f78..4085511 100644 (file)
--- a/src/jalview/xml/binding/jalview/Pdbentry.java
+++ b/src/jalview/xml/binding/jalview/Pdbentry.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/Sequence.java b/src/jalview/xml/binding/jalview/Sequence.java
index d5e1d33..70b3994 100644 (file)
--- a/src/jalview/xml/binding/jalview/Sequence.java
+++ b/src/jalview/xml/binding/jalview/Sequence.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/SequenceSet.java b/src/jalview/xml/binding/jalview/SequenceSet.java
index 1ac96eb..1c0d450 100644 (file)
--- a/src/jalview/xml/binding/jalview/SequenceSet.java
+++ b/src/jalview/xml/binding/jalview/SequenceSet.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/SequenceType.java b/src/jalview/xml/binding/jalview/SequenceType.java
index d59b714..228f864 100644 (file)
--- a/src/jalview/xml/binding/jalview/SequenceType.java
+++ b/src/jalview/xml/binding/jalview/SequenceType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/ThresholdType.java b/src/jalview/xml/binding/jalview/ThresholdType.java
index a987524..9a6fae1 100644 (file)
--- a/src/jalview/xml/binding/jalview/ThresholdType.java
+++ b/src/jalview/xml/binding/jalview/ThresholdType.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/VAMSAS.java b/src/jalview/xml/binding/jalview/VAMSAS.java
index bcefa96..8afb127 100644 (file)
--- a/src/jalview/xml/binding/jalview/VAMSAS.java
+++ b/src/jalview/xml/binding/jalview/VAMSAS.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/WebServiceParameterSet.java b/src/jalview/xml/binding/jalview/WebServiceParameterSet.java
index 8bd69a1..4c92a10 100644 (file)
--- a/src/jalview/xml/binding/jalview/WebServiceParameterSet.java
+++ b/src/jalview/xml/binding/jalview/WebServiceParameterSet.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 

diff --git a/src/jalview/xml/binding/jalview/package-info.java b/src/jalview/xml/binding/jalview/package-info.java
index de1dd05..58854de 100644 (file)
--- a/src/jalview/xml/binding/jalview/package-info.java
+++ b/src/jalview/xml/binding/jalview/package-info.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2018.09.18 at 02:23:07 PM BST 
+// Generated on: 2018.09.18 at 04:36:20 PM BST 
 //
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "www.vamsas.ac.uk/jalview/version2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)