From: gmungoc Date: Fri, 7 Jun 2019 12:42:24 +0000 (+0100) Subject: JAL-3187 Viewport schema attributes for showComplementFeatures[OnTop] X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=90ca6fed28feba2b98914c199e53394733e95bbd;p=jalview.git JAL-3187 Viewport schema attributes for showComplementFeatures[OnTop] --- diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd index 07dee98..1d2235e 100755 --- a/schemas/jalview.xsd +++ b/schemas/jalview.xsd @@ -463,6 +463,8 @@ + + diff --git a/src/jalview/xml/binding/jalview/AlcodonFrame.java b/src/jalview/xml/binding/jalview/AlcodonFrame.java index 83f1ee2..112247e 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/Annotation.java b/src/jalview/xml/binding/jalview/Annotation.java index 0dbcad0..5cc23eb 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/AnnotationColourScheme.java b/src/jalview/xml/binding/jalview/AnnotationColourScheme.java index 44affa2..25ad072 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/AnnotationElement.java b/src/jalview/xml/binding/jalview/AnnotationElement.java index de408d2..ac45865 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/DoubleMatrix.java b/src/jalview/xml/binding/jalview/DoubleMatrix.java index b4c07bc..308125d 100644 --- a/src/jalview/xml/binding/jalview/DoubleMatrix.java +++ b/src/jalview/xml/binding/jalview/DoubleMatrix.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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/DoubleVector.java b/src/jalview/xml/binding/jalview/DoubleVector.java index e2592ab..b627a52 100644 --- a/src/jalview/xml/binding/jalview/DoubleVector.java +++ b/src/jalview/xml/binding/jalview/DoubleVector.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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/Feature.java b/src/jalview/xml/binding/jalview/Feature.java index 9001ee2..b870a50 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/FeatureMatcher.java b/src/jalview/xml/binding/jalview/FeatureMatcher.java index 0daf56a..cb42c91 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/FeatureMatcherSet.java b/src/jalview/xml/binding/jalview/FeatureMatcherSet.java index bf69d5b..e3dd183 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/FilterBy.java b/src/jalview/xml/binding/jalview/FilterBy.java index 5684acf..24349cc 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/JalviewModel.java b/src/jalview/xml/binding/jalview/JalviewModel.java index ed57edc..346d74d8 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // @@ -208,6 +208,8 @@ import javax.xml.datatype.XMLGregorianCalendar; * <attribute name="textColThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /> * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> * <attribute name="complementId" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="showComplementFeatures" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> + * <attribute name="showComplementFeaturesOnTop" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> * </restriction> * </complexContent> * </complexType> @@ -4808,6 +4810,8 @@ public class JalviewModel { * <attribute name="textColThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /> * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> * <attribute name="complementId" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="showComplementFeatures" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> + * <attribute name="showComplementFeaturesOnTop" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> * </restriction> * </complexContent> * </complexType> @@ -4914,6 +4918,10 @@ public class JalviewModel { protected String id; @XmlAttribute(name = "complementId") protected String complementId; + @XmlAttribute(name = "showComplementFeatures") + protected Boolean showComplementFeatures; + @XmlAttribute(name = "showComplementFeaturesOnTop") + protected Boolean showComplementFeaturesOnTop; @XmlAttribute(name = "width") protected Integer width; @XmlAttribute(name = "height") @@ -6034,6 +6042,62 @@ public class JalviewModel { } /** + * Gets the value of the showComplementFeatures property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isShowComplementFeatures() { + if (showComplementFeatures == null) { + return false; + } else { + return showComplementFeatures; + } + } + + /** + * Sets the value of the showComplementFeatures property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setShowComplementFeatures(Boolean value) { + this.showComplementFeatures = value; + } + + /** + * Gets the value of the showComplementFeaturesOnTop property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isShowComplementFeaturesOnTop() { + if (showComplementFeaturesOnTop == null) { + return false; + } else { + return showComplementFeaturesOnTop; + } + } + + /** + * Sets the value of the showComplementFeaturesOnTop property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setShowComplementFeaturesOnTop(Boolean value) { + this.showComplementFeaturesOnTop = value; + } + + /** * Gets the value of the width property. * * @return diff --git a/src/jalview/xml/binding/jalview/JalviewUserColours.java b/src/jalview/xml/binding/jalview/JalviewUserColours.java index 701647c..5362365 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/MapListType.java b/src/jalview/xml/binding/jalview/MapListType.java index 3d7b5eb..9771383 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/Mapping.java b/src/jalview/xml/binding/jalview/Mapping.java index 3cbebc0..611c450 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/NoValueColour.java b/src/jalview/xml/binding/jalview/NoValueColour.java index 15fc45d..0e9159c 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/ObjectFactory.java b/src/jalview/xml/binding/jalview/ObjectFactory.java index 6858f07..df3ee93 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/PcaDataType.java b/src/jalview/xml/binding/jalview/PcaDataType.java index e8c7cf2..2db832a 100644 --- a/src/jalview/xml/binding/jalview/PcaDataType.java +++ b/src/jalview/xml/binding/jalview/PcaDataType.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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/Pdbentry.java b/src/jalview/xml/binding/jalview/Pdbentry.java index 843ea6c..a013503 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/Sequence.java b/src/jalview/xml/binding/jalview/Sequence.java index abb40c9..2f1aada 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/SequenceSet.java b/src/jalview/xml/binding/jalview/SequenceSet.java index 0fc7771..00eb15e 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/SequenceType.java b/src/jalview/xml/binding/jalview/SequenceType.java index 07b8c24..97176a8 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/ThresholdType.java b/src/jalview/xml/binding/jalview/ThresholdType.java index e8b7e28..704b020 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/VAMSAS.java b/src/jalview/xml/binding/jalview/VAMSAS.java index 1f68de9..25f2d97 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/WebServiceParameterSet.java b/src/jalview/xml/binding/jalview/WebServiceParameterSet.java index c884556..2bfd3e0 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // diff --git a/src/jalview/xml/binding/jalview/package-info.java b/src/jalview/xml/binding/jalview/package-info.java index bd6dc77..e7464ad 100644 --- 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 http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.12.20 at 11:47:26 AM GMT +// Generated on: 2019.06.07 at 01:41:05 PM BST // @javax.xml.bind.annotation.XmlSchema(namespace = "www.vamsas.ac.uk/jalview/version2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)