From ae447a3691fb85aaf4e27cd6af8a6e0eb3d50530 Mon Sep 17 00:00:00 2001 From: James Procter Date: Wed, 22 Feb 2023 22:14:15 +0000 Subject: [PATCH] =?utf8?q?JAL-4133=20store/restore=20alignment=20view=E2=80=99?= =?utf8?q?s=20charWidth=20and=20charHeight=20in=20Jalview=20project?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- schemas/jalview.xsd | 2 + src/jalview/gui/AlignViewport.java | 2 +- src/jalview/project/Jalview2XML.java | 7 + src/jalview/xml/binding/embl/EntrySetType.java | 2 +- src/jalview/xml/binding/embl/EntryType.java | 2 +- src/jalview/xml/binding/embl/ObjectFactory.java | 2 +- src/jalview/xml/binding/embl/ROOT.java | 2 +- src/jalview/xml/binding/embl/XrefType.java | 2 +- src/jalview/xml/binding/jalview/AlcodonFrame.java | 2 +- src/jalview/xml/binding/jalview/Annotation.java | 2 +- .../binding/jalview/AnnotationColourScheme.java | 2 +- .../xml/binding/jalview/AnnotationElement.java | 2 +- src/jalview/xml/binding/jalview/DoubleMatrix.java | 2 +- src/jalview/xml/binding/jalview/DoubleVector.java | 2 +- src/jalview/xml/binding/jalview/Feature.java | 2 +- .../xml/binding/jalview/FeatureMatcher.java | 2 +- .../xml/binding/jalview/FeatureMatcherSet.java | 2 +- src/jalview/xml/binding/jalview/FilterBy.java | 2 +- src/jalview/xml/binding/jalview/JalviewModel.java | 206 +++++++++++++------- .../xml/binding/jalview/JalviewUserColours.java | 2 +- src/jalview/xml/binding/jalview/MapListType.java | 2 +- src/jalview/xml/binding/jalview/Mapping.java | 2 +- src/jalview/xml/binding/jalview/NoValueColour.java | 2 +- src/jalview/xml/binding/jalview/ObjectFactory.java | 2 +- src/jalview/xml/binding/jalview/PcaDataType.java | 2 +- src/jalview/xml/binding/jalview/Pdbentry.java | 2 +- src/jalview/xml/binding/jalview/Sequence.java | 2 +- src/jalview/xml/binding/jalview/SequenceSet.java | 2 +- src/jalview/xml/binding/jalview/SequenceType.java | 2 +- src/jalview/xml/binding/jalview/ThresholdType.java | 2 +- src/jalview/xml/binding/jalview/VAMSAS.java | 2 +- .../binding/jalview/WebServiceParameterSet.java | 2 +- src/jalview/xml/binding/jalview/package-info.java | 2 +- src/jalview/xml/binding/uniprot/CitationType.java | 2 +- src/jalview/xml/binding/uniprot/CofactorType.java | 2 +- src/jalview/xml/binding/uniprot/CommentType.java | 2 +- .../xml/binding/uniprot/ConsortiumType.java | 2 +- .../xml/binding/uniprot/DbReferenceType.java | 2 +- src/jalview/xml/binding/uniprot/Entry.java | 2 +- src/jalview/xml/binding/uniprot/EventType.java | 2 +- src/jalview/xml/binding/uniprot/EvidenceType.java | 2 +- .../xml/binding/uniprot/EvidencedStringType.java | 2 +- src/jalview/xml/binding/uniprot/FeatureType.java | 2 +- .../xml/binding/uniprot/GeneLocationType.java | 2 +- src/jalview/xml/binding/uniprot/GeneNameType.java | 2 +- src/jalview/xml/binding/uniprot/GeneType.java | 2 +- .../xml/binding/uniprot/ImportedFromType.java | 2 +- .../xml/binding/uniprot/InteractantType.java | 2 +- src/jalview/xml/binding/uniprot/IsoformType.java | 2 +- src/jalview/xml/binding/uniprot/KeywordType.java | 2 +- src/jalview/xml/binding/uniprot/LocationType.java | 2 +- src/jalview/xml/binding/uniprot/MoleculeType.java | 2 +- src/jalview/xml/binding/uniprot/NameListType.java | 2 +- src/jalview/xml/binding/uniprot/ObjectFactory.java | 2 +- .../xml/binding/uniprot/OrganismNameType.java | 2 +- src/jalview/xml/binding/uniprot/OrganismType.java | 2 +- src/jalview/xml/binding/uniprot/PersonType.java | 2 +- .../binding/uniprot/PhysiologicalReactionType.java | 2 +- src/jalview/xml/binding/uniprot/PositionType.java | 2 +- src/jalview/xml/binding/uniprot/PropertyType.java | 2 +- .../xml/binding/uniprot/ProteinExistenceType.java | 2 +- src/jalview/xml/binding/uniprot/ProteinType.java | 2 +- src/jalview/xml/binding/uniprot/ReactionType.java | 2 +- src/jalview/xml/binding/uniprot/ReferenceType.java | 2 +- src/jalview/xml/binding/uniprot/SequenceType.java | 2 +- .../xml/binding/uniprot/SourceDataType.java | 2 +- src/jalview/xml/binding/uniprot/SourceType.java | 2 +- src/jalview/xml/binding/uniprot/StatusType.java | 2 +- .../binding/uniprot/SubcellularLocationType.java | 2 +- src/jalview/xml/binding/uniprot/Uniprot.java | 2 +- src/jalview/xml/binding/uniprot/package-info.java | 2 +- 71 files changed, 208 insertions(+), 143 deletions(-) diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd index e7cb580..7a18d59 100755 --- a/schemas/jalview.xsd +++ b/schemas/jalview.xsd @@ -496,6 +496,8 @@ use="optional" default="true" /> + + diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java index fea74db..90f627e 100644 --- a/src/jalview/gui/AlignViewport.java +++ b/src/jalview/gui/AlignViewport.java @@ -340,7 +340,7 @@ public class AlignViewport extends AlignmentViewport viewStyle.setFontName(font.getName()); viewStyle.setFontStyle(font.getStyle()); viewStyle.setFontSize(font.getSize()); - + validCharWidth = true; } diff --git a/src/jalview/project/Jalview2XML.java b/src/jalview/project/Jalview2XML.java index 2b1b687..8142435 100644 --- a/src/jalview/project/Jalview2XML.java +++ b/src/jalview/project/Jalview2XML.java @@ -1555,6 +1555,8 @@ public class Jalview2XML view.setConservationSelected(av.getConservationSelected()); view.setPidSelected(av.getAbovePIDThreshold()); + view.setCharHeight(av.getCharHeight()); + view.setCharWidth(av.getCharWidth()); final Font font = av.getFont(); view.setFontName(font.getName()); view.setFontSize(font.getSize()); @@ -4880,6 +4882,11 @@ public class Jalview2XML viewport.setIncrement(safeInt(view.getConsThreshold())); viewport.setShowJVSuffix(safeBoolean(view.isShowFullId())); viewport.setRightAlignIds(safeBoolean(view.isRightAlignIds())); + if (view.getCharWidth()!=null) + { + viewport.setCharWidth(view.getCharWidth()); + viewport.setCharHeight(view.getCharHeight()); + } viewport.setFont(new Font(view.getFontName(), safeInt(view.getFontStyle()), safeInt(view.getFontSize())), true); diff --git a/src/jalview/xml/binding/embl/EntrySetType.java b/src/jalview/xml/binding/embl/EntrySetType.java index 492bfab..d72dd8d 100644 --- a/src/jalview/xml/binding/embl/EntrySetType.java +++ b/src/jalview/xml/binding/embl/EntrySetType.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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/embl/EntryType.java b/src/jalview/xml/binding/embl/EntryType.java index 5faed76..f744eb5 100644 --- a/src/jalview/xml/binding/embl/EntryType.java +++ b/src/jalview/xml/binding/embl/EntryType.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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/embl/ObjectFactory.java b/src/jalview/xml/binding/embl/ObjectFactory.java index 5d805e2..4a5bf19 100644 --- a/src/jalview/xml/binding/embl/ObjectFactory.java +++ b/src/jalview/xml/binding/embl/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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/embl/ROOT.java b/src/jalview/xml/binding/embl/ROOT.java index a4a56ac..6d98c82 100644 --- a/src/jalview/xml/binding/embl/ROOT.java +++ b/src/jalview/xml/binding/embl/ROOT.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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/embl/XrefType.java b/src/jalview/xml/binding/embl/XrefType.java index 9d68a83..a53c82b 100644 --- a/src/jalview/xml/binding/embl/XrefType.java +++ b/src/jalview/xml/binding/embl/XrefType.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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/AlcodonFrame.java b/src/jalview/xml/binding/jalview/AlcodonFrame.java index 63a8c00..53bc217 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/Annotation.java b/src/jalview/xml/binding/jalview/Annotation.java index 0dd0c99..8df1313 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/AnnotationColourScheme.java b/src/jalview/xml/binding/jalview/AnnotationColourScheme.java index 17d55ce..fe0f49d 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/AnnotationElement.java b/src/jalview/xml/binding/jalview/AnnotationElement.java index 40fdc11..4d34ce2 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/DoubleMatrix.java b/src/jalview/xml/binding/jalview/DoubleMatrix.java index 9bcdde4..8ab2f67 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/DoubleVector.java b/src/jalview/xml/binding/jalview/DoubleVector.java index c4cc54a..5c34abf 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/Feature.java b/src/jalview/xml/binding/jalview/Feature.java index d1491a0..41771fd 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/FeatureMatcher.java b/src/jalview/xml/binding/jalview/FeatureMatcher.java index 5368a64..94c26e0 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/FeatureMatcherSet.java b/src/jalview/xml/binding/jalview/FeatureMatcherSet.java index 7a2a052..ea26bed 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/FilterBy.java b/src/jalview/xml/binding/jalview/FilterBy.java index 57a5796..e13905d 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/JalviewModel.java b/src/jalview/xml/binding/jalview/JalviewModel.java index 518d8ff..cbe06b4 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // @@ -210,6 +210,8 @@ 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" /> @@ -308,8 +310,8 @@ import javax.xml.datatype.XMLGregorianCalendar; * </element> * <element name="pcaData" type="{www.jalview.org}PcaDataType"/> * </sequence> - * <attGroup ref="{www.jalview.org}SimilarityParams"/> * <attGroup ref="{www.jalview.org}swingwindow"/> + * <attGroup ref="{www.jalview.org}SimilarityParams"/> * <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 +3124,8 @@ public class JalviewModel { * </element> * <element name="pcaData" type="{www.jalview.org}PcaDataType"/> * </sequence> - * <attGroup ref="{www.jalview.org}SimilarityParams"/> * <attGroup ref="{www.jalview.org}swingwindow"/> + * <attGroup ref="{www.jalview.org}SimilarityParams"/> * <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 +3180,6 @@ public class JalviewModel { protected Boolean showLabels; @XmlAttribute(name = "linkToAllViews") protected Boolean linkToAllViews; - @XmlAttribute(name = "includeGaps") - protected Boolean includeGaps; - @XmlAttribute(name = "matchGaps") - protected Boolean matchGaps; - @XmlAttribute(name = "includeGappedColumns") - protected Boolean includeGappedColumns; - @XmlAttribute(name = "denominateByShortestLength") - protected Boolean denominateByShortestLength; @XmlAttribute(name = "width") protected Integer width; @XmlAttribute(name = "height") @@ -3194,6 +3188,14 @@ public class JalviewModel { protected Integer xpos; @XmlAttribute(name = "ypos") protected Integer ypos; + @XmlAttribute(name = "includeGaps") + protected Boolean includeGaps; + @XmlAttribute(name = "matchGaps") + protected Boolean matchGaps; + @XmlAttribute(name = "includeGappedColumns") + protected Boolean includeGappedColumns; + @XmlAttribute(name = "denominateByShortestLength") + protected Boolean denominateByShortestLength; /** * Gets the value of the sequencePoint property. @@ -3542,195 +3544,195 @@ public class JalviewModel { } /** - * 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; } /** - * 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; } @@ -4826,6 +4828,8 @@ 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" /> @@ -4922,6 +4926,10 @@ 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") @@ -5805,6 +5813,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 diff --git a/src/jalview/xml/binding/jalview/JalviewUserColours.java b/src/jalview/xml/binding/jalview/JalviewUserColours.java index a1994be..f383f52 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/MapListType.java b/src/jalview/xml/binding/jalview/MapListType.java index e6f0b6f..752b37d 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/Mapping.java b/src/jalview/xml/binding/jalview/Mapping.java index 3b8ba23..b1dbda2 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/NoValueColour.java b/src/jalview/xml/binding/jalview/NoValueColour.java index 54c1d75..dd1357d 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/ObjectFactory.java b/src/jalview/xml/binding/jalview/ObjectFactory.java index 367ed50..ea5428a 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/PcaDataType.java b/src/jalview/xml/binding/jalview/PcaDataType.java index a98326a..a510399 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/Pdbentry.java b/src/jalview/xml/binding/jalview/Pdbentry.java index 3e686fb..8c3a499 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/Sequence.java b/src/jalview/xml/binding/jalview/Sequence.java index 59c7d39..09fdcb5 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/SequenceSet.java b/src/jalview/xml/binding/jalview/SequenceSet.java index 075d82b..f50e4cb 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/SequenceType.java b/src/jalview/xml/binding/jalview/SequenceType.java index bc9649b..0a360ed 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/ThresholdType.java b/src/jalview/xml/binding/jalview/ThresholdType.java index 3d8b492..f717f2e 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/VAMSAS.java b/src/jalview/xml/binding/jalview/VAMSAS.java index b12aa27..0983075 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/WebServiceParameterSet.java b/src/jalview/xml/binding/jalview/WebServiceParameterSet.java index 64b7c35..9baa3bc 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // diff --git a/src/jalview/xml/binding/jalview/package-info.java b/src/jalview/xml/binding/jalview/package-info.java index 56339f7..5bb7db6 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: 2023.02.22 at 05:27:55 PM GMT +// Generated on: 2023.02.22 at 10:08:57 PM GMT // @javax.xml.bind.annotation.XmlSchema(namespace = "www.vamsas.ac.uk/jalview/version2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) diff --git a/src/jalview/xml/binding/uniprot/CitationType.java b/src/jalview/xml/binding/uniprot/CitationType.java index c4a231a..a7381a1 100644 --- a/src/jalview/xml/binding/uniprot/CitationType.java +++ b/src/jalview/xml/binding/uniprot/CitationType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/CofactorType.java b/src/jalview/xml/binding/uniprot/CofactorType.java index 0a99cff..693e586 100644 --- a/src/jalview/xml/binding/uniprot/CofactorType.java +++ b/src/jalview/xml/binding/uniprot/CofactorType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/CommentType.java b/src/jalview/xml/binding/uniprot/CommentType.java index 34e2a6f..72ca25c 100644 --- a/src/jalview/xml/binding/uniprot/CommentType.java +++ b/src/jalview/xml/binding/uniprot/CommentType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/ConsortiumType.java b/src/jalview/xml/binding/uniprot/ConsortiumType.java index 2605fcf..a2db65a 100644 --- a/src/jalview/xml/binding/uniprot/ConsortiumType.java +++ b/src/jalview/xml/binding/uniprot/ConsortiumType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/DbReferenceType.java b/src/jalview/xml/binding/uniprot/DbReferenceType.java index c774562..d3c111e 100644 --- a/src/jalview/xml/binding/uniprot/DbReferenceType.java +++ b/src/jalview/xml/binding/uniprot/DbReferenceType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/Entry.java b/src/jalview/xml/binding/uniprot/Entry.java index 7424da7..7c485d5 100644 --- a/src/jalview/xml/binding/uniprot/Entry.java +++ b/src/jalview/xml/binding/uniprot/Entry.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/EventType.java b/src/jalview/xml/binding/uniprot/EventType.java index 88aaf7a..ed97121 100644 --- a/src/jalview/xml/binding/uniprot/EventType.java +++ b/src/jalview/xml/binding/uniprot/EventType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/EvidenceType.java b/src/jalview/xml/binding/uniprot/EvidenceType.java index e3870ea..4e99255 100644 --- a/src/jalview/xml/binding/uniprot/EvidenceType.java +++ b/src/jalview/xml/binding/uniprot/EvidenceType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/EvidencedStringType.java b/src/jalview/xml/binding/uniprot/EvidencedStringType.java index 8d8f9d0..caa9d94 100644 --- a/src/jalview/xml/binding/uniprot/EvidencedStringType.java +++ b/src/jalview/xml/binding/uniprot/EvidencedStringType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/FeatureType.java b/src/jalview/xml/binding/uniprot/FeatureType.java index e4aa4cc..ca03a54 100644 --- a/src/jalview/xml/binding/uniprot/FeatureType.java +++ b/src/jalview/xml/binding/uniprot/FeatureType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/GeneLocationType.java b/src/jalview/xml/binding/uniprot/GeneLocationType.java index 7fdc013..998d1b9 100644 --- a/src/jalview/xml/binding/uniprot/GeneLocationType.java +++ b/src/jalview/xml/binding/uniprot/GeneLocationType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/GeneNameType.java b/src/jalview/xml/binding/uniprot/GeneNameType.java index 722c376..dc03075 100644 --- a/src/jalview/xml/binding/uniprot/GeneNameType.java +++ b/src/jalview/xml/binding/uniprot/GeneNameType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/GeneType.java b/src/jalview/xml/binding/uniprot/GeneType.java index f198fed..d419e09 100644 --- a/src/jalview/xml/binding/uniprot/GeneType.java +++ b/src/jalview/xml/binding/uniprot/GeneType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/ImportedFromType.java b/src/jalview/xml/binding/uniprot/ImportedFromType.java index b85f402..1dacab8 100644 --- a/src/jalview/xml/binding/uniprot/ImportedFromType.java +++ b/src/jalview/xml/binding/uniprot/ImportedFromType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/InteractantType.java b/src/jalview/xml/binding/uniprot/InteractantType.java index 5e636cd..d579506 100644 --- a/src/jalview/xml/binding/uniprot/InteractantType.java +++ b/src/jalview/xml/binding/uniprot/InteractantType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/IsoformType.java b/src/jalview/xml/binding/uniprot/IsoformType.java index a782347..69b251e 100644 --- a/src/jalview/xml/binding/uniprot/IsoformType.java +++ b/src/jalview/xml/binding/uniprot/IsoformType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/KeywordType.java b/src/jalview/xml/binding/uniprot/KeywordType.java index a5a2146..5497e6d 100644 --- a/src/jalview/xml/binding/uniprot/KeywordType.java +++ b/src/jalview/xml/binding/uniprot/KeywordType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/LocationType.java b/src/jalview/xml/binding/uniprot/LocationType.java index 0fd27de..78a388b 100644 --- a/src/jalview/xml/binding/uniprot/LocationType.java +++ b/src/jalview/xml/binding/uniprot/LocationType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/MoleculeType.java b/src/jalview/xml/binding/uniprot/MoleculeType.java index 57a5a55..e734c27 100644 --- a/src/jalview/xml/binding/uniprot/MoleculeType.java +++ b/src/jalview/xml/binding/uniprot/MoleculeType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/NameListType.java b/src/jalview/xml/binding/uniprot/NameListType.java index 6a79d3a..c638af7 100644 --- a/src/jalview/xml/binding/uniprot/NameListType.java +++ b/src/jalview/xml/binding/uniprot/NameListType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/ObjectFactory.java b/src/jalview/xml/binding/uniprot/ObjectFactory.java index 12151f4..0459e04 100644 --- a/src/jalview/xml/binding/uniprot/ObjectFactory.java +++ b/src/jalview/xml/binding/uniprot/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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/OrganismNameType.java b/src/jalview/xml/binding/uniprot/OrganismNameType.java index 017e233..312c0ee 100644 --- a/src/jalview/xml/binding/uniprot/OrganismNameType.java +++ b/src/jalview/xml/binding/uniprot/OrganismNameType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/OrganismType.java b/src/jalview/xml/binding/uniprot/OrganismType.java index 6e8fdb2..55774e3 100644 --- a/src/jalview/xml/binding/uniprot/OrganismType.java +++ b/src/jalview/xml/binding/uniprot/OrganismType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/PersonType.java b/src/jalview/xml/binding/uniprot/PersonType.java index dfc88ae..2b130f2 100644 --- a/src/jalview/xml/binding/uniprot/PersonType.java +++ b/src/jalview/xml/binding/uniprot/PersonType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/PhysiologicalReactionType.java b/src/jalview/xml/binding/uniprot/PhysiologicalReactionType.java index dd09ace..445f99f 100644 --- a/src/jalview/xml/binding/uniprot/PhysiologicalReactionType.java +++ b/src/jalview/xml/binding/uniprot/PhysiologicalReactionType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/PositionType.java b/src/jalview/xml/binding/uniprot/PositionType.java index ffec70a..05b6afc 100644 --- a/src/jalview/xml/binding/uniprot/PositionType.java +++ b/src/jalview/xml/binding/uniprot/PositionType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/PropertyType.java b/src/jalview/xml/binding/uniprot/PropertyType.java index aa1c388..c9324b0 100644 --- a/src/jalview/xml/binding/uniprot/PropertyType.java +++ b/src/jalview/xml/binding/uniprot/PropertyType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/ProteinExistenceType.java b/src/jalview/xml/binding/uniprot/ProteinExistenceType.java index 32c8aae..f7f989a 100644 --- a/src/jalview/xml/binding/uniprot/ProteinExistenceType.java +++ b/src/jalview/xml/binding/uniprot/ProteinExistenceType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/ProteinType.java b/src/jalview/xml/binding/uniprot/ProteinType.java index 45309f5..5f1a018 100644 --- a/src/jalview/xml/binding/uniprot/ProteinType.java +++ b/src/jalview/xml/binding/uniprot/ProteinType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/ReactionType.java b/src/jalview/xml/binding/uniprot/ReactionType.java index 8e05607..806a8f7 100644 --- a/src/jalview/xml/binding/uniprot/ReactionType.java +++ b/src/jalview/xml/binding/uniprot/ReactionType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/ReferenceType.java b/src/jalview/xml/binding/uniprot/ReferenceType.java index a277dbb..e00e9a7 100644 --- a/src/jalview/xml/binding/uniprot/ReferenceType.java +++ b/src/jalview/xml/binding/uniprot/ReferenceType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/SequenceType.java b/src/jalview/xml/binding/uniprot/SequenceType.java index 08b7fe6..e747820 100644 --- a/src/jalview/xml/binding/uniprot/SequenceType.java +++ b/src/jalview/xml/binding/uniprot/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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/SourceDataType.java b/src/jalview/xml/binding/uniprot/SourceDataType.java index 796b9fd..9598976 100644 --- a/src/jalview/xml/binding/uniprot/SourceDataType.java +++ b/src/jalview/xml/binding/uniprot/SourceDataType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/SourceType.java b/src/jalview/xml/binding/uniprot/SourceType.java index be6f86f..755ca21 100644 --- a/src/jalview/xml/binding/uniprot/SourceType.java +++ b/src/jalview/xml/binding/uniprot/SourceType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/StatusType.java b/src/jalview/xml/binding/uniprot/StatusType.java index f0ae4fd..63c281d 100644 --- a/src/jalview/xml/binding/uniprot/StatusType.java +++ b/src/jalview/xml/binding/uniprot/StatusType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/SubcellularLocationType.java b/src/jalview/xml/binding/uniprot/SubcellularLocationType.java index 657157b..bebbd62 100644 --- a/src/jalview/xml/binding/uniprot/SubcellularLocationType.java +++ b/src/jalview/xml/binding/uniprot/SubcellularLocationType.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/Uniprot.java b/src/jalview/xml/binding/uniprot/Uniprot.java index 9860147..1de89de 100644 --- a/src/jalview/xml/binding/uniprot/Uniprot.java +++ b/src/jalview/xml/binding/uniprot/Uniprot.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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // diff --git a/src/jalview/xml/binding/uniprot/package-info.java b/src/jalview/xml/binding/uniprot/package-info.java index 7c68798..560368d 100644 --- a/src/jalview/xml/binding/uniprot/package-info.java +++ b/src/jalview/xml/binding/uniprot/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: 2023.02.22 at 05:27:56 PM GMT +// Generated on: 2023.02.22 at 10:08:58 PM GMT // @javax.xml.bind.annotation.XmlSchema(namespace = "http://uniprot.org/uniprot", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -- 1.7.10.2