Merge branch 'develop' into patch/JAL-4281_idwidthandannotHeight_in_project

[jalview.git] / src / jalview / xml / binding / jalview / MatrixType.java

diff --git a/src/jalview/xml/binding/jalview/MatrixType.java b/src/jalview/xml/binding/jalview/MatrixType.java
index 54384ba..34d1158 100644 (file)
--- a/src/jalview/xml/binding/jalview/MatrixType.java
+++ b/src/jalview/xml/binding/jalview/MatrixType.java
@@ -2,7 +2,7 @@
 // This file was generated by the Eclipse Implementation of JAXB, v2.3.3 
 // See https://eclipse-ee4j.github.io/jaxb-ri 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2023.09.08 at 03:55:49 PM BST 
+// Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
 
@@ -19,6 +19,12 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
+ * Represents matrix data imported to Jalview, and the
+ *                             results of any derived calculations (independent of a particular
+ *                             view
+ *                             on the matrix).
+ *                     
+ * 
  * <p>Java class for MatrixType complex type.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
@@ -32,14 +38,13 @@ import javax.xml.bind.annotation.XmlType;
  *         <element name="groups" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
  *         <element name="newick" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
  *         <element name="property" type="{www.vamsas.ac.uk/jalview/version2}property" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="mapping" type="{www.vamsas.ac.uk/jalview/version2}mapListType" minOccurs="0"/>
  *       </sequence>
  *       <attribute name="type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       <attribute name="rows" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
  *       <attribute name="cols" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
  *       <attribute name="treeMethod" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       <attribute name="cutHeight" type="{http://www.w3.org/2001/XMLSchema}double" />
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
  *     </restriction>
  *   </complexContent>
  * </complexType>
@@ -52,8 +57,7 @@ import javax.xml.bind.annotation.XmlType;
     "elements",
     "groups",
     "newick",
-    "property",
-    "mapping"
+    "property"
 })
 public class MatrixType {
 
@@ -62,7 +66,6 @@ public class MatrixType {
     protected List<String> groups;
     protected List<String> newick;
     protected List<Property> property;
-    protected MapListType mapping;
     @XmlAttribute(name = "type", required = true)
     protected String type;
     @XmlAttribute(name = "rows", required = true)
@@ -73,7 +76,7 @@ public class MatrixType {
     protected String treeMethod;
     @XmlAttribute(name = "cutHeight")
     protected Double cutHeight;
-    @XmlAttribute(name = "id")
+    @XmlAttribute(name = "id", required = true)
     protected String id;
 
     /**
@@ -188,30 +191,6 @@ public class MatrixType {
     }
 
     /**
-     * Gets the value of the mapping property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MapListType }
-     *     
-     */
-    public MapListType getMapping() {
-        return mapping;
-    }
-
-    /**
-     * Sets the value of the mapping property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MapListType }
-     *     
-     */
-    public void setMapping(MapListType value) {
-        this.mapping = value;
-    }
-
-    /**
      * Gets the value of the type property.
      * 
      * @return