diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-08-27 12:07:52 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-08-27 12:07:52 +0200 |
commit | 1051a42329a603821f415383343d253724d4cd65 (patch) | |
tree | f8a0b6e8445b7034dfe38d6ba3a61f1429a75a6e /id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java | |
parent | bb1b12ac5b240629e16ea1c7a50891e99f4adc14 (diff) | |
parent | eb0cf88708f3d689c2cb6bb0dbf83dd290bee887 (diff) | |
download | moa-id-spss-1051a42329a603821f415383343d253724d4cd65.tar.gz moa-id-spss-1051a42329a603821f415383343d253724d4cd65.tar.bz2 moa-id-spss-1051a42329a603821f415383343d253724d4cd65.zip |
Merge STORK-SAML-Engine 1.5.1 and STORK-Commons 1.5.1
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java
Diffstat (limited to 'id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java')
-rw-r--r-- | id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java | 193 |
1 files changed, 89 insertions, 104 deletions
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java index 8700fcfca..4414ef05d 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlAccessType; @@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Qualification * - * <p>Java class for QualificationType complex type. + * <p> + * Java class for QualificationType complex type. * - * <p>The following schema fragment specifies the expected content contained within this class. + * <p> + * The following schema fragment specifies the expected content contained within this class. * * <pre> * <complexType name="QualificationType"> @@ -40,115 +40,100 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "QualificationType", propOrder = { - "name", - "additionalInformation" -}) +@XmlType(name = "QualificationType", propOrder = { "name", "additionalInformation" }) public class QualificationType { - @XmlElement(name = "Name", required = true) - protected String name; - @XmlElement(name = "AdditionalInformation") - protected RichTextTagType additionalInformation; - @XmlAttribute(name = "localID") - protected String localID; - @XmlAttribute(name = "nationalID") - protected String nationalID; + @XmlElement(name = "Name", required = true) + protected String name; + @XmlElement(name = "AdditionalInformation") + protected RichTextTagType additionalInformation; + @XmlAttribute(name = "localID") + protected String localID; + @XmlAttribute(name = "nationalID") + protected String nationalID; - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } + /** + * Sets the value of the name property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setName(String value) { + this.name = value; + } - /** - * Gets the value of the additionalInformation property. - * - * @return - * possible object is - * {@link RichTextTagType } - * - */ - public RichTextTagType getAdditionalInformation() { - return additionalInformation; - } + /** + * Gets the value of the additionalInformation property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getAdditionalInformation() { + return additionalInformation; + } - /** - * Sets the value of the additionalInformation property. - * - * @param value - * allowed object is - * {@link RichTextTagType } - * - */ - public void setAdditionalInformation(RichTextTagType value) { - this.additionalInformation = value; - } + /** + * Sets the value of the additionalInformation property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setAdditionalInformation(RichTextTagType value) { + this.additionalInformation = value; + } - /** - * Gets the value of the localID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getLocalID() { - return localID; - } + /** + * Gets the value of the localID property. + * + * @return possible object is {@link String } + * + */ + public String getLocalID() { + return localID; + } - /** - * Sets the value of the localID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setLocalID(String value) { - this.localID = value; - } + /** + * Sets the value of the localID property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setLocalID(String value) { + this.localID = value; + } - /** - * Gets the value of the nationalID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNationalID() { - return nationalID; - } + /** + * Gets the value of the nationalID property. + * + * @return possible object is {@link String } + * + */ + public String getNationalID() { + return nationalID; + } - /** - * Sets the value of the nationalID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNationalID(String value) { - this.nationalID = value; - } + /** + * Sets the value of the nationalID property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setNationalID(String value) { + this.nationalID = value; + } } |