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/GradingSchemeAndGradeDistributionGuidanceType.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/GradingSchemeAndGradeDistributionGuidanceType.java')
-rw-r--r-- | id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GradingSchemeAndGradeDistributionGuidanceType.java | 103 |
1 files changed, 47 insertions, 56 deletions
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GradingSchemeAndGradeDistributionGuidanceType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GradingSchemeAndGradeDistributionGuidanceType.java index ab896f7f4..a853aec65 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GradingSchemeAndGradeDistributionGuidanceType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GradingSchemeAndGradeDistributionGuidanceType.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; - /** * Grading scheme and grade distribution guidance * - * <p>Java class for GradingSchemeAndGradeDistributionGuidanceType complex type. + * <p> + * Java class for GradingSchemeAndGradeDistributionGuidanceType 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="GradingSchemeAndGradeDistributionGuidanceType"> @@ -37,63 +37,54 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "GradingSchemeAndGradeDistributionGuidanceType", propOrder = { - "gradingScheme", - "gradeDistributionGuidance" -}) +@XmlType(name = "GradingSchemeAndGradeDistributionGuidanceType", propOrder = { "gradingScheme", "gradeDistributionGuidance" }) public class GradingSchemeAndGradeDistributionGuidanceType { - @XmlElement(name = "GradingScheme", required = true) - protected RichTextTagType gradingScheme; - @XmlElement(name = "GradeDistributionGuidance") - protected RichTextTagType gradeDistributionGuidance; + @XmlElement(name = "GradingScheme", required = true) + protected RichTextTagType gradingScheme; + @XmlElement(name = "GradeDistributionGuidance") + protected RichTextTagType gradeDistributionGuidance; - /** - * Gets the value of the gradingScheme property. - * - * @return - * possible object is - * {@link RichTextTagType } - * - */ - public RichTextTagType getGradingScheme() { - return gradingScheme; - } + /** + * Gets the value of the gradingScheme property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getGradingScheme() { + return gradingScheme; + } - /** - * Sets the value of the gradingScheme property. - * - * @param value - * allowed object is - * {@link RichTextTagType } - * - */ - public void setGradingScheme(RichTextTagType value) { - this.gradingScheme = value; - } + /** + * Sets the value of the gradingScheme property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setGradingScheme(RichTextTagType value) { + this.gradingScheme = value; + } - /** - * Gets the value of the gradeDistributionGuidance property. - * - * @return - * possible object is - * {@link RichTextTagType } - * - */ - public RichTextTagType getGradeDistributionGuidance() { - return gradeDistributionGuidance; - } + /** + * Gets the value of the gradeDistributionGuidance property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getGradeDistributionGuidance() { + return gradeDistributionGuidance; + } - /** - * Sets the value of the gradeDistributionGuidance property. - * - * @param value - * allowed object is - * {@link RichTextTagType } - * - */ - public void setGradeDistributionGuidance(RichTextTagType value) { - this.gradeDistributionGuidance = value; - } + /** + * Sets the value of the gradeDistributionGuidance property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setGradeDistributionGuidance(RichTextTagType value) { + this.gradeDistributionGuidance = value; + } } |