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/AttachedFileDataType.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/AttachedFileDataType.java')
-rw-r--r-- | id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileDataType.java | 145 |
1 files changed, 66 insertions, 79 deletions
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileDataType.java index d30d97334..17212282b 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileDataType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileDataType.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; @@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Data file * - * <p>Java class for AttachedFileDataType complex type. + * <p> + * Java class for AttachedFileDataType 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="AttachedFileDataType"> @@ -38,88 +38,75 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "AttachedFileDataType", propOrder = { - "description", - "mime", - "data" -}) +@XmlType(name = "AttachedFileDataType", propOrder = { "description", "mime", "data" }) public class AttachedFileDataType { - @XmlElement(name = "Description", required = true) - protected String description; - @XmlElement(name = "Mime", required = true) - protected MimeType mime; - @XmlElement(name = "Data", required = true) - protected byte[] data; + @XmlElement(name = "Description", required = true) + protected String description; + @XmlElement(name = "Mime", required = true) + protected MimeType mime; + @XmlElement(name = "Data", required = true) + protected byte[] data; - /** - * Gets the value of the description property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDescription() { - return description; - } + /** + * Gets the value of the description property. + * + * @return possible object is {@link String } + * + */ + public String getDescription() { + return description; + } - /** - * Sets the value of the description property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDescription(String value) { - this.description = value; - } + /** + * Sets the value of the description property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setDescription(String value) { + this.description = value; + } - /** - * Gets the value of the mime property. - * - * @return - * possible object is - * {@link MimeType } - * - */ - public MimeType getMime() { - return mime; - } + /** + * Gets the value of the mime property. + * + * @return possible object is {@link MimeType } + * + */ + public MimeType getMime() { + return mime; + } - /** - * Sets the value of the mime property. - * - * @param value - * allowed object is - * {@link MimeType } - * - */ - public void setMime(MimeType value) { - this.mime = value; - } + /** + * Sets the value of the mime property. + * + * @param value + * allowed object is {@link MimeType } + * + */ + public void setMime(MimeType value) { + this.mime = value; + } - /** - * Gets the value of the data property. - * - * @return - * possible object is - * byte[] - */ - public byte[] getData() { - return data; - } + /** + * Gets the value of the data property. + * + * @return possible object is byte[] + */ + public byte[] getData() { + return data; + } - /** - * Sets the value of the data property. - * - * @param value - * allowed object is - * byte[] - */ - public void setData(byte[] value) { - this.data = value; - } + /** + * Sets the value of the data property. + * + * @param value + * allowed object is byte[] + */ + public void setData(byte[] value) { + this.data = value; + } } |