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/CourseUnitLanguagesOfInstructionType.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/CourseUnitLanguagesOfInstructionType.java')
-rw-r--r-- | id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguagesOfInstructionType.java | 70 |
1 files changed, 33 insertions, 37 deletions
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguagesOfInstructionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguagesOfInstructionType.java index bfc905a75..94db5baa0 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguagesOfInstructionType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguagesOfInstructionType.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 java.util.ArrayList; @@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Language of instruction * - * <p>Java class for CourseUnitLanguagesOfInstructionType complex type. + * <p> + * Java class for CourseUnitLanguagesOfInstructionType 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="CourseUnitLanguagesOfInstructionType"> @@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CourseUnitLanguagesOfInstructionType", propOrder = { - "language" -}) +@XmlType(name = "CourseUnitLanguagesOfInstructionType", propOrder = { "language" }) public class CourseUnitLanguagesOfInstructionType { - @XmlElement(name = "Language", required = true) - protected List<CourseUnitLanguageOfInstructionType> language; + @XmlElement(name = "Language", required = true) + protected List<CourseUnitLanguageOfInstructionType> language; - /** - * Gets the value of the language property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the language property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getLanguage().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link CourseUnitLanguageOfInstructionType } - * - * - */ - public List<CourseUnitLanguageOfInstructionType> getLanguage() { - if (language == null) { - language = new ArrayList<CourseUnitLanguageOfInstructionType>(); - } - return this.language; - } + /** + * Gets the value of the language property. + * + * <p> + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a <CODE>set</CODE> method for the language property. + * + * <p> + * For example, to add a new item, do as follows: + * + * <pre> + * getLanguage().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list {@link CourseUnitLanguageOfInstructionType } + * + * + */ + public List<CourseUnitLanguageOfInstructionType> getLanguage() { + if (language == null) { + language = new ArrayList<CourseUnitLanguageOfInstructionType>(); + } + return this.language; + } } |