Merge branch 'develop' into patch/JAL-4281_idwidthandannotHeight_in_project
[jalview.git] / src / jalview / xml / binding / jalview / JalviewModel.java
index 61c767d..360c074 100644 (file)
@@ -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: 2022.02.07 at 04:44:47 PM GMT 
+// Generated on: 2023.11.01 at 07:03:09 PM GMT 
 //
 
 
@@ -210,9 +210,13 @@ import javax.xml.datatype.XMLGregorianCalendar;
  *                   <attribute name="ignoreGapsinConsensus" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
  *                   <attribute name="startRes" type="{http://www.w3.org/2001/XMLSchema}int" />
  *                   <attribute name="startSeq" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                   <attribute name="charWidth" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                   <attribute name="charHeight" type="{http://www.w3.org/2001/XMLSchema}int" />
  *                   <attribute name="fontName" type="{http://www.w3.org/2001/XMLSchema}string" />
  *                   <attribute name="fontSize" type="{http://www.w3.org/2001/XMLSchema}int" />
  *                   <attribute name="fontStyle" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                   <attribute name="idWidth" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                   <attribute name="idWidthManuallyAdjusted" type="{http://www.w3.org/2001/XMLSchema}boolean" />
  *                   <attribute name="scaleProteinAsCdna" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
  *                   <attribute name="viewName" type="{http://www.w3.org/2001/XMLSchema}string" />
  *                   <attribute name="sequenceSetId" type="{http://www.w3.org/2001/XMLSchema}string" />
@@ -258,6 +262,8 @@ import javax.xml.datatype.XMLGregorianCalendar;
  *                   <attribute name="markUnlinked" type="{http://www.w3.org/2001/XMLSchema}boolean" />
  *                   <attribute name="fitToWindow" type="{http://www.w3.org/2001/XMLSchema}boolean" />
  *                   <attribute name="currentTree" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                   <attribute name="columnWise" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *                   <attribute name="columnReference" type="{http://www.w3.org/2001/XMLSchema}string" />
  *                   <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
  *                   <attribute name="linkToAllViews" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
  *                 </restriction>
@@ -308,8 +314,8 @@ import javax.xml.datatype.XMLGregorianCalendar;
  *                     </element>
  *                     <element name="pcaData" type="{www.jalview.org}PcaDataType"/>
  *                   </sequence>
- *                   <attGroup ref="{www.jalview.org}swingwindow"/>
  *                   <attGroup ref="{www.jalview.org}SimilarityParams"/>
+ *                   <attGroup ref="{www.jalview.org}swingwindow"/>
  *                   <attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" />
  *                   <attribute name="scoreModelName" type="{http://www.w3.org/2001/XMLSchema}string" />
  *                   <attribute name="xDim" type="{http://www.w3.org/2001/XMLSchema}int" />
@@ -3122,8 +3128,8 @@ public class JalviewModel {
      *         </element>
      *         <element name="pcaData" type="{www.jalview.org}PcaDataType"/>
      *       </sequence>
-     *       <attGroup ref="{www.jalview.org}swingwindow"/>
      *       <attGroup ref="{www.jalview.org}SimilarityParams"/>
+     *       <attGroup ref="{www.jalview.org}swingwindow"/>
      *       <attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" />
      *       <attribute name="scoreModelName" type="{http://www.w3.org/2001/XMLSchema}string" />
      *       <attribute name="xDim" type="{http://www.w3.org/2001/XMLSchema}int" />
@@ -3178,14 +3184,6 @@ public class JalviewModel {
         protected Boolean showLabels;
         @XmlAttribute(name = "linkToAllViews")
         protected Boolean linkToAllViews;
-        @XmlAttribute(name = "width")
-        protected Integer width;
-        @XmlAttribute(name = "height")
-        protected Integer height;
-        @XmlAttribute(name = "xpos")
-        protected Integer xpos;
-        @XmlAttribute(name = "ypos")
-        protected Integer ypos;
         @XmlAttribute(name = "includeGaps")
         protected Boolean includeGaps;
         @XmlAttribute(name = "matchGaps")
@@ -3194,6 +3192,14 @@ public class JalviewModel {
         protected Boolean includeGappedColumns;
         @XmlAttribute(name = "denominateByShortestLength")
         protected Boolean denominateByShortestLength;
+        @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 sequencePoint property.
@@ -3542,195 +3548,195 @@ public class JalviewModel {
         }
 
         /**
-         * Gets the value of the width property.
+         * Gets the value of the includeGaps property.
          * 
          * @return
          *     possible object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public Integer getWidth() {
-            return width;
+        public Boolean isIncludeGaps() {
+            return includeGaps;
         }
 
         /**
-         * Sets the value of the width property.
+         * Sets the value of the includeGaps property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public void setWidth(Integer value) {
-            this.width = value;
+        public void setIncludeGaps(Boolean value) {
+            this.includeGaps = value;
         }
 
         /**
-         * Gets the value of the height property.
+         * Gets the value of the matchGaps property.
          * 
          * @return
          *     possible object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public Integer getHeight() {
-            return height;
+        public Boolean isMatchGaps() {
+            return matchGaps;
         }
 
         /**
-         * Sets the value of the height property.
+         * Sets the value of the matchGaps property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public void setHeight(Integer value) {
-            this.height = value;
+        public void setMatchGaps(Boolean value) {
+            this.matchGaps = value;
         }
 
         /**
-         * Gets the value of the xpos property.
+         * Gets the value of the includeGappedColumns property.
          * 
          * @return
          *     possible object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public Integer getXpos() {
-            return xpos;
+        public Boolean isIncludeGappedColumns() {
+            return includeGappedColumns;
         }
 
         /**
-         * Sets the value of the xpos property.
+         * Sets the value of the includeGappedColumns property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public void setXpos(Integer value) {
-            this.xpos = value;
+        public void setIncludeGappedColumns(Boolean value) {
+            this.includeGappedColumns = value;
         }
 
         /**
-         * Gets the value of the ypos property.
+         * Gets the value of the denominateByShortestLength property.
          * 
          * @return
          *     possible object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public Integer getYpos() {
-            return ypos;
+        public Boolean isDenominateByShortestLength() {
+            return denominateByShortestLength;
         }
 
         /**
-         * Sets the value of the ypos property.
+         * Sets the value of the denominateByShortestLength property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public void setYpos(Integer value) {
-            this.ypos = value;
+        public void setDenominateByShortestLength(Boolean value) {
+            this.denominateByShortestLength = value;
         }
 
         /**
-         * Gets the value of the includeGaps property.
+         * Gets the value of the width property.
          * 
          * @return
          *     possible object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public Boolean isIncludeGaps() {
-            return includeGaps;
+        public Integer getWidth() {
+            return width;
         }
 
         /**
-         * Sets the value of the includeGaps property.
+         * Sets the value of the width property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public void setIncludeGaps(Boolean value) {
-            this.includeGaps = value;
+        public void setWidth(Integer value) {
+            this.width = value;
         }
 
         /**
-         * Gets the value of the matchGaps property.
+         * Gets the value of the height property.
          * 
          * @return
          *     possible object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public Boolean isMatchGaps() {
-            return matchGaps;
+        public Integer getHeight() {
+            return height;
         }
 
         /**
-         * Sets the value of the matchGaps property.
+         * Sets the value of the height property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public void setMatchGaps(Boolean value) {
-            this.matchGaps = value;
+        public void setHeight(Integer value) {
+            this.height = value;
         }
 
         /**
-         * Gets the value of the includeGappedColumns property.
+         * Gets the value of the xpos property.
          * 
          * @return
          *     possible object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public Boolean isIncludeGappedColumns() {
-            return includeGappedColumns;
+        public Integer getXpos() {
+            return xpos;
         }
 
         /**
-         * Sets the value of the includeGappedColumns property.
+         * Sets the value of the xpos property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public void setIncludeGappedColumns(Boolean value) {
-            this.includeGappedColumns = value;
+        public void setXpos(Integer value) {
+            this.xpos = value;
         }
 
         /**
-         * Gets the value of the denominateByShortestLength property.
+         * Gets the value of the ypos property.
          * 
          * @return
          *     possible object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public Boolean isDenominateByShortestLength() {
-            return denominateByShortestLength;
+        public Integer getYpos() {
+            return ypos;
         }
 
         /**
-         * Sets the value of the denominateByShortestLength property.
+         * Sets the value of the ypos property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public void setDenominateByShortestLength(Boolean value) {
-            this.denominateByShortestLength = value;
+        public void setYpos(Integer value) {
+            this.ypos = value;
         }
 
 
@@ -4198,6 +4204,8 @@ public class JalviewModel {
      *       <attribute name="markUnlinked" type="{http://www.w3.org/2001/XMLSchema}boolean" />
      *       <attribute name="fitToWindow" type="{http://www.w3.org/2001/XMLSchema}boolean" />
      *       <attribute name="currentTree" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+     *       <attribute name="columnWise" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+     *       <attribute name="columnReference" type="{http://www.w3.org/2001/XMLSchema}string" />
      *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
      *       <attribute name="linkToAllViews" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
      *     </restriction>
@@ -4236,6 +4244,10 @@ public class JalviewModel {
         protected Boolean fitToWindow;
         @XmlAttribute(name = "currentTree")
         protected Boolean currentTree;
+        @XmlAttribute(name = "columnWise")
+        protected Boolean columnWise;
+        @XmlAttribute(name = "columnReference")
+        protected String columnReference;
         @XmlAttribute(name = "id")
         @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
         @XmlID
@@ -4517,6 +4529,58 @@ public class JalviewModel {
         }
 
         /**
+         * Gets the value of the columnWise property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link Boolean }
+         *     
+         */
+        public boolean isColumnWise() {
+            if (columnWise == null) {
+                return false;
+            } else {
+                return columnWise;
+            }
+        }
+
+        /**
+         * Sets the value of the columnWise property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link Boolean }
+         *     
+         */
+        public void setColumnWise(Boolean value) {
+            this.columnWise = value;
+        }
+
+        /**
+         * Gets the value of the columnReference property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link String }
+         *     
+         */
+        public String getColumnReference() {
+            return columnReference;
+        }
+
+        /**
+         * Sets the value of the columnReference property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link String }
+         *     
+         */
+        public void setColumnReference(String value) {
+            this.columnReference = value;
+        }
+
+        /**
          * Gets the value of the id property.
          * 
          * @return
@@ -4826,9 +4890,13 @@ public class JalviewModel {
      *       <attribute name="ignoreGapsinConsensus" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
      *       <attribute name="startRes" type="{http://www.w3.org/2001/XMLSchema}int" />
      *       <attribute name="startSeq" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       <attribute name="charWidth" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       <attribute name="charHeight" type="{http://www.w3.org/2001/XMLSchema}int" />
      *       <attribute name="fontName" type="{http://www.w3.org/2001/XMLSchema}string" />
      *       <attribute name="fontSize" type="{http://www.w3.org/2001/XMLSchema}int" />
      *       <attribute name="fontStyle" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       <attribute name="idWidth" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       <attribute name="idWidthManuallyAdjusted" type="{http://www.w3.org/2001/XMLSchema}boolean" />
      *       <attribute name="scaleProteinAsCdna" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
      *       <attribute name="viewName" type="{http://www.w3.org/2001/XMLSchema}string" />
      *       <attribute name="sequenceSetId" type="{http://www.w3.org/2001/XMLSchema}string" />
@@ -4922,12 +4990,20 @@ public class JalviewModel {
         protected Integer startRes;
         @XmlAttribute(name = "startSeq")
         protected Integer startSeq;
+        @XmlAttribute(name = "charWidth")
+        protected Integer charWidth;
+        @XmlAttribute(name = "charHeight")
+        protected Integer charHeight;
         @XmlAttribute(name = "fontName")
         protected String fontName;
         @XmlAttribute(name = "fontSize")
         protected Integer fontSize;
         @XmlAttribute(name = "fontStyle")
         protected Integer fontStyle;
+        @XmlAttribute(name = "idWidth")
+        protected Integer idWidth;
+        @XmlAttribute(name = "idWidthManuallyAdjusted")
+        protected Boolean idWidthManuallyAdjusted;
         @XmlAttribute(name = "scaleProteinAsCdna")
         protected Boolean scaleProteinAsCdna;
         @XmlAttribute(name = "viewName")
@@ -5805,6 +5881,54 @@ public class JalviewModel {
         }
 
         /**
+         * Gets the value of the charWidth property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link Integer }
+         *     
+         */
+        public Integer getCharWidth() {
+            return charWidth;
+        }
+
+        /**
+         * Sets the value of the charWidth property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link Integer }
+         *     
+         */
+        public void setCharWidth(Integer value) {
+            this.charWidth = value;
+        }
+
+        /**
+         * Gets the value of the charHeight property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link Integer }
+         *     
+         */
+        public Integer getCharHeight() {
+            return charHeight;
+        }
+
+        /**
+         * Sets the value of the charHeight property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link Integer }
+         *     
+         */
+        public void setCharHeight(Integer value) {
+            this.charHeight = value;
+        }
+
+        /**
          * Gets the value of the fontName property.
          * 
          * @return
@@ -5877,6 +6001,54 @@ public class JalviewModel {
         }
 
         /**
+         * Gets the value of the idWidth property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link Integer }
+         *     
+         */
+        public Integer getIdWidth() {
+            return idWidth;
+        }
+
+        /**
+         * Sets the value of the idWidth property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link Integer }
+         *     
+         */
+        public void setIdWidth(Integer value) {
+            this.idWidth = value;
+        }
+
+        /**
+         * Gets the value of the idWidthManuallyAdjusted property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link Boolean }
+         *     
+         */
+        public Boolean isIdWidthManuallyAdjusted() {
+            return idWidthManuallyAdjusted;
+        }
+
+        /**
+         * Sets the value of the idWidthManuallyAdjusted property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link Boolean }
+         *     
+         */
+        public void setIdWidthManuallyAdjusted(Boolean value) {
+            this.idWidthManuallyAdjusted = value;
+        }
+
+        /**
          * Gets the value of the scaleProteinAsCdna property.
          * 
          * @return