From 71d8702f4f5f12c9c2f1dcb119091704dc738522 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Fri, 7 Jun 2019 13:42:24 +0100 Subject: [PATCH] JAL-3187 Viewport schema attributes for showComplementFeatures[OnTop] Conflicts: src/jalview/xml/binding/jalview/AlcodonFrame.java src/jalview/xml/binding/jalview/Annotation.java src/jalview/xml/binding/jalview/AnnotationColourScheme.java src/jalview/xml/binding/jalview/AnnotationElement.java src/jalview/xml/binding/jalview/DoubleMatrix.java src/jalview/xml/binding/jalview/DoubleVector.java src/jalview/xml/binding/jalview/Feature.java src/jalview/xml/binding/jalview/FeatureMatcher.java src/jalview/xml/binding/jalview/FeatureMatcherSet.java src/jalview/xml/binding/jalview/FilterBy.java src/jalview/xml/binding/jalview/JalviewModel.java src/jalview/xml/binding/jalview/JalviewUserColours.java src/jalview/xml/binding/jalview/MapListType.java src/jalview/xml/binding/jalview/Mapping.java src/jalview/xml/binding/jalview/NoValueColour.java src/jalview/xml/binding/jalview/ObjectFactory.java src/jalview/xml/binding/jalview/PcaDataType.java src/jalview/xml/binding/jalview/Pdbentry.java src/jalview/xml/binding/jalview/Sequence.java src/jalview/xml/binding/jalview/SequenceSet.java src/jalview/xml/binding/jalview/SequenceType.java src/jalview/xml/binding/jalview/ThresholdType.java src/jalview/xml/binding/jalview/VAMSAS.java src/jalview/xml/binding/jalview/WebServiceParameterSet.java src/jalview/xml/binding/jalview/package-info.java --- schemas/jalview.xsd | 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 | 66 +++++++++++++++++++- .../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 +- 26 files changed, 91 insertions(+), 25 deletions(-) diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd index 07dee98..1d2235e 100755 --- a/schemas/jalview.xsd +++ b/schemas/jalview.xsd @@ -463,6 +463,8 @@ + + diff --git a/src/jalview/xml/binding/jalview/AlcodonFrame.java b/src/jalview/xml/binding/jalview/AlcodonFrame.java index 3e84f59..cb90984 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/Annotation.java b/src/jalview/xml/binding/jalview/Annotation.java index 3149d77..35f78f3 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/AnnotationColourScheme.java b/src/jalview/xml/binding/jalview/AnnotationColourScheme.java index 3e6bacd..6f5ef65 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/AnnotationElement.java b/src/jalview/xml/binding/jalview/AnnotationElement.java index 0d36902..6780323 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/DoubleMatrix.java b/src/jalview/xml/binding/jalview/DoubleMatrix.java index fb88b73..5edb2e8 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/DoubleVector.java b/src/jalview/xml/binding/jalview/DoubleVector.java index 997982e..68ebf9b 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/Feature.java b/src/jalview/xml/binding/jalview/Feature.java index 294c28c..39fc0c3 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/FeatureMatcher.java b/src/jalview/xml/binding/jalview/FeatureMatcher.java index 1225838..c92f72c 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/FeatureMatcherSet.java b/src/jalview/xml/binding/jalview/FeatureMatcherSet.java index 56d511b..0c21215 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/FilterBy.java b/src/jalview/xml/binding/jalview/FilterBy.java index 0e52dc7..36b454f 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/JalviewModel.java b/src/jalview/xml/binding/jalview/JalviewModel.java index dd47f48..0ea2491 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:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // @@ -208,6 +208,8 @@ import javax.xml.datatype.XMLGregorianCalendar; * <attribute name="textColThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /> * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> * <attribute name="complementId" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="showComplementFeatures" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> + * <attribute name="showComplementFeaturesOnTop" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> * </restriction> * </complexContent> * </complexType> @@ -4808,6 +4810,8 @@ public class JalviewModel { * <attribute name="textColThreshold" type="{http://www.w3.org/2001/XMLSchema}int" /> * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> * <attribute name="complementId" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="showComplementFeatures" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> + * <attribute name="showComplementFeaturesOnTop" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> * </restriction> * </complexContent> * </complexType> @@ -4914,6 +4918,10 @@ public class JalviewModel { protected String id; @XmlAttribute(name = "complementId") protected String complementId; + @XmlAttribute(name = "showComplementFeatures") + protected Boolean showComplementFeatures; + @XmlAttribute(name = "showComplementFeaturesOnTop") + protected Boolean showComplementFeaturesOnTop; @XmlAttribute(name = "width") protected Integer width; @XmlAttribute(name = "height") @@ -6034,6 +6042,62 @@ public class JalviewModel { } /** + * Gets the value of the showComplementFeatures property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isShowComplementFeatures() { + if (showComplementFeatures == null) { + return false; + } else { + return showComplementFeatures; + } + } + + /** + * Sets the value of the showComplementFeatures property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setShowComplementFeatures(Boolean value) { + this.showComplementFeatures = value; + } + + /** + * Gets the value of the showComplementFeaturesOnTop property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isShowComplementFeaturesOnTop() { + if (showComplementFeaturesOnTop == null) { + return false; + } else { + return showComplementFeaturesOnTop; + } + } + + /** + * Sets the value of the showComplementFeaturesOnTop property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setShowComplementFeaturesOnTop(Boolean value) { + this.showComplementFeaturesOnTop = value; + } + + /** * Gets the value of the width property. * * @return diff --git a/src/jalview/xml/binding/jalview/JalviewUserColours.java b/src/jalview/xml/binding/jalview/JalviewUserColours.java index 7369c8b..c43e04c 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/MapListType.java b/src/jalview/xml/binding/jalview/MapListType.java index 3d505b3..1a31d82 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/Mapping.java b/src/jalview/xml/binding/jalview/Mapping.java index 344d15f..5ebeb7e 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/NoValueColour.java b/src/jalview/xml/binding/jalview/NoValueColour.java index e13c4c5..9db4ea3 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/ObjectFactory.java b/src/jalview/xml/binding/jalview/ObjectFactory.java index 5063042..e0b2127 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:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/PcaDataType.java b/src/jalview/xml/binding/jalview/PcaDataType.java index 92d89a3..6234f32 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/Pdbentry.java b/src/jalview/xml/binding/jalview/Pdbentry.java index 9f0bf91..d5132ab 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/Sequence.java b/src/jalview/xml/binding/jalview/Sequence.java index 8da342c..b842947 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/SequenceSet.java b/src/jalview/xml/binding/jalview/SequenceSet.java index d187631..6aee6ac 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/SequenceType.java b/src/jalview/xml/binding/jalview/SequenceType.java index 46f5fa6..aef7543 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/ThresholdType.java b/src/jalview/xml/binding/jalview/ThresholdType.java index d48a44a..1b3d6d4 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/VAMSAS.java b/src/jalview/xml/binding/jalview/VAMSAS.java index b7fbdee..5d341c3 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/WebServiceParameterSet.java b/src/jalview/xml/binding/jalview/WebServiceParameterSet.java index f27ae98..659eab9 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: 2019.06.07 at 02:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // diff --git a/src/jalview/xml/binding/jalview/package-info.java b/src/jalview/xml/binding/jalview/package-info.java index f39e4c2..3ed532d 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:14:40 PM BST +// Generated on: 2019.06.07 at 02:21:15 PM BST // @javax.xml.bind.annotation.XmlSchema(namespace = "www.vamsas.ac.uk/jalview/version2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -- 1.7.10.2