X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fxml%2Fbinding%2Fjalview%2FAnnotation.java;h=5e3d599d2f2673fbf60b9ca7b6450a74b29dc6e5;hb=f3d6a13271e3f34dfb4e40d6a2a7df1d392f8014;hp=148406eb55db73ddc31a011072800a62edbf8ed4;hpb=4d64932654de3f6ffe07db11d18f2d21f558c6e6;p=jalview.git diff --git a/src/jalview/xml/binding/jalview/Annotation.java b/src/jalview/xml/binding/jalview/Annotation.java index 148406e..5e3d599 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.09.28 at 12:18:54 PM BST +// Generated on: 2023.05.13 at 06:58:41 PM BST // @@ -42,16 +42,8 @@ import javax.xml.bind.annotation.XmlType; * </complexContent> * </complexType> * </element> - * <element name="property" maxOccurs="unbounded" minOccurs="0"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" /> - * </restriction> - * </complexContent> - * </complexType> - * </element> + * <element name="contactmatrix" type="{www.vamsas.ac.uk/jalview/version2}MatrixType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="property" type="{www.vamsas.ac.uk/jalview/version2}property" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * <attribute name="graph" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="graphType" type="{http://www.w3.org/2001/XMLSchema}int" /> @@ -83,6 +75,7 @@ import javax.xml.bind.annotation.XmlType; "label", "description", "thresholdLine", + "contactmatrix", "property" }) @XmlRootElement(name = "Annotation") @@ -93,7 +86,8 @@ public class Annotation { protected String label; protected String description; protected Annotation.ThresholdLine thresholdLine; - protected List property; + protected List contactmatrix; + protected List property; @XmlAttribute(name = "graph", required = true) protected boolean graph; @XmlAttribute(name = "graphType") @@ -231,6 +225,35 @@ public class Annotation { } /** + * Gets the value of the contactmatrix property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the contactmatrix property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getContactmatrix().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link MatrixType } + * + * + */ + public List getContactmatrix() { + if (contactmatrix == null) { + contactmatrix = new ArrayList(); + } + return this.contactmatrix; + } + + /** * Gets the value of the property property. * *

@@ -248,13 +271,13 @@ public class Annotation { * *

* Objects of the following type(s) are allowed in the list - * {@link Annotation.Property } + * {@link Property } * * */ - public List getProperty() { + public List getProperty() { if (property == null) { - property = new ArrayList(); + property = new ArrayList(); } return this.property; } @@ -681,84 +704,6 @@ public class Annotation { * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" /> - * </restriction> - * </complexContent> - * </complexType> - * - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Property { - - @XmlAttribute(name = "name") - protected String name; - @XmlAttribute(name = "value") - protected String value; - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - } - - - /** - *

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">
      *       <attribute name="label" type="{http://www.w3.org/2001/XMLSchema}string" />
      *       <attribute name="value" type="{http://www.w3.org/2001/XMLSchema}float" />
      *       <attribute name="colour" type="{http://www.w3.org/2001/XMLSchema}int" />