From 54b0c2d021ed75f90943f103385814c7cdb4972d Mon Sep 17 00:00:00 2001 From: gmungoc Date: Thu, 10 Dec 2020 13:02:58 +0000 Subject: [PATCH] JAL-1713 schema and JAXB changes to save Overview in project file --- schemas/jalview.xsd | 9 + src/jalview/xml/binding/jalview/JalviewModel.java | 294 +++++++++++++++++++- src/jalview/xml/binding/jalview/ObjectFactory.java | 10 +- src/jalview/xml/binding/jalview/package-info.java | 2 +- 4 files changed, 311 insertions(+), 4 deletions(-) diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd index 1d2235e..5c3e1c7 100755 --- a/schemas/jalview.xsd +++ b/schemas/jalview.xsd @@ -391,6 +391,15 @@ + + + + + + + + + diff --git a/src/jalview/xml/binding/jalview/JalviewModel.java b/src/jalview/xml/binding/jalview/JalviewModel.java index 0ea2491..e73604d 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: 2019.06.07 at 02:21:15 PM BST +// Generated on: 2020.12.10 at 10:15:41 AM GMT // @@ -165,6 +165,19 @@ import javax.xml.datatype.XMLGregorianCalendar; * </complexContent> * </complexType> * </element> + * <element name="overview" minOccurs="0"> + * <complexType> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attGroup ref="{www.jalview.org}swingwindow"/> + * <attribute name="showHidden" type="{http://www.w3.org/2001/XMLSchema}boolean" /> + * <attribute name="residueColour" type="{http://www.w3.org/2001/XMLSchema}int" /> + * <attribute name="gapColour" type="{http://www.w3.org/2001/XMLSchema}int" /> + * <attribute name="hiddenColour" type="{http://www.w3.org/2001/XMLSchema}int" /> + * </restriction> + * </complexContent> + * </complexType> + * </element> * </sequence> * <attGroup ref="{www.jalview.org}swingwindow"/> * <attribute name="conservationSelected" type="{http://www.w3.org/2001/XMLSchema}boolean" /> @@ -4767,6 +4780,19 @@ public class JalviewModel { * </complexContent> * </complexType> * </element> + * <element name="overview" minOccurs="0"> + * <complexType> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attGroup ref="{www.jalview.org}swingwindow"/> + * <attribute name="showHidden" type="{http://www.w3.org/2001/XMLSchema}boolean" /> + * <attribute name="residueColour" type="{http://www.w3.org/2001/XMLSchema}int" /> + * <attribute name="gapColour" type="{http://www.w3.org/2001/XMLSchema}int" /> + * <attribute name="hiddenColour" type="{http://www.w3.org/2001/XMLSchema}int" /> + * </restriction> + * </complexContent> + * </complexType> + * </element> * </sequence> * <attGroup ref="{www.jalview.org}swingwindow"/> * <attribute name="conservationSelected" type="{http://www.w3.org/2001/XMLSchema}boolean" /> @@ -4823,7 +4849,8 @@ public class JalviewModel { @XmlType(name = "", propOrder = { "annotationColours", "hiddenColumns", - "calcIdParam" + "calcIdParam", + "overview" }) public static class Viewport { @@ -4833,6 +4860,8 @@ public class JalviewModel { protected List hiddenColumns; @XmlElement(namespace = "www.jalview.org") protected List calcIdParam; + @XmlElement(namespace = "www.jalview.org") + protected JalviewModel.Viewport.Overview overview; @XmlAttribute(name = "conservationSelected") protected Boolean conservationSelected; @XmlAttribute(name = "pidSelected") @@ -5014,6 +5043,30 @@ public class JalviewModel { } /** + * Gets the value of the overview property. + * + * @return + * possible object is + * {@link JalviewModel.Viewport.Overview } + * + */ + public JalviewModel.Viewport.Overview getOverview() { + return overview; + } + + /** + * Sets the value of the overview property. + * + * @param value + * allowed object is + * {@link JalviewModel.Viewport.Overview } + * + */ + public void setOverview(JalviewModel.Viewport.Overview value) { + this.overview = value; + } + + /** * Gets the value of the conservationSelected property. * * @return @@ -6374,6 +6427,243 @@ public class JalviewModel { } + + /** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <attGroup ref="{www.jalview.org}swingwindow"/>
+         *       <attribute name="showHidden" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+         *       <attribute name="residueColour" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="gapColour" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *       <attribute name="hiddenColour" type="{http://www.w3.org/2001/XMLSchema}int" />
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         *
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Overview { + + @XmlAttribute(name = "showHidden") + protected Boolean showHidden; + @XmlAttribute(name = "residueColour") + protected Integer residueColour; + @XmlAttribute(name = "gapColour") + protected Integer gapColour; + @XmlAttribute(name = "hiddenColour") + protected Integer hiddenColour; + @XmlAttribute(name = "width") + protected Integer width; + @XmlAttribute(name = "height") + protected Integer height; + @XmlAttribute(name = "xpos") + protected Integer xpos; + @XmlAttribute(name = "ypos") + protected Integer ypos; + + /** + * Gets the value of the showHidden property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isShowHidden() { + return showHidden; + } + + /** + * Sets the value of the showHidden property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setShowHidden(Boolean value) { + this.showHidden = value; + } + + /** + * Gets the value of the residueColour property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getResidueColour() { + return residueColour; + } + + /** + * Sets the value of the residueColour property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setResidueColour(Integer value) { + this.residueColour = value; + } + + /** + * Gets the value of the gapColour property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getGapColour() { + return gapColour; + } + + /** + * Sets the value of the gapColour property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setGapColour(Integer value) { + this.gapColour = value; + } + + /** + * Gets the value of the hiddenColour property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getHiddenColour() { + return hiddenColour; + } + + /** + * Sets the value of the hiddenColour property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setHiddenColour(Integer value) { + this.hiddenColour = value; + } + + /** + * Gets the value of the width property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getWidth() { + return width; + } + + /** + * Sets the value of the width property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setWidth(Integer value) { + this.width = value; + } + + /** + * Gets the value of the height property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getHeight() { + return height; + } + + /** + * Sets the value of the height property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setHeight(Integer value) { + this.height = value; + } + + /** + * Gets the value of the xpos property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getXpos() { + return xpos; + } + + /** + * Sets the value of the xpos property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setXpos(Integer value) { + this.xpos = value; + } + + /** + * Gets the value of the ypos property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getYpos() { + return ypos; + } + + /** + * Sets the value of the ypos property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setYpos(Integer value) { + this.ypos = value; + } + + } + } } diff --git a/src/jalview/xml/binding/jalview/ObjectFactory.java b/src/jalview/xml/binding/jalview/ObjectFactory.java index e0b2127..59fee21 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: 2019.06.07 at 02:21:15 PM BST +// Generated on: 2020.12.10 at 10:15:41 AM GMT // @@ -443,6 +443,14 @@ public class ObjectFactory { } /** + * Create an instance of {@link JalviewModel.Viewport.Overview } + * + */ + public JalviewModel.Viewport.Overview createJalviewModelViewportOverview() { + return new JalviewModel.Viewport.Overview(); + } + + /** * Create an instance of {@link JalviewModel.JSeq.RnaViewer.SecondaryStructure } * */ diff --git a/src/jalview/xml/binding/jalview/package-info.java b/src/jalview/xml/binding/jalview/package-info.java index 3ed532d..2e7728f 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: 2019.06.07 at 02:21:15 PM BST +// Generated on: 2020.12.10 at 10:15:41 AM GMT // @javax.xml.bind.annotation.XmlSchema(namespace = "www.vamsas.ac.uk/jalview/version2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -- 1.7.10.2