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/EHEAFrameworkType.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/EHEAFrameworkType.java')
-rw-r--r-- | id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/EHEAFrameworkType.java | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/EHEAFrameworkType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/EHEAFrameworkType.java index 05dbdedfe..49a5a74ee 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/EHEAFrameworkType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/EHEAFrameworkType.java @@ -5,19 +5,20 @@ // 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.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; - /** - * <p>Java class for EHEAFrameworkType. + * <p> + * Java class for EHEAFrameworkType. * - * <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. + * <p> + * * <pre> * <simpleType name="EHEAFrameworkType"> * <restriction base="{http://www.w3.org/2001/XMLSchema}string"> @@ -33,44 +34,43 @@ import javax.xml.bind.annotation.XmlType; @XmlEnum public enum EHEAFrameworkType { + /** + * First Cycle + * + */ + @XmlEnumValue("FirstCycle") + FIRST_CYCLE("FirstCycle"), - /** - * First Cycle - * - */ - @XmlEnumValue("FirstCycle") - FIRST_CYCLE("FirstCycle"), - - /** - * Second Cycle - * - */ - @XmlEnumValue("SecondCycle") - SECOND_CYCLE("SecondCycle"), + /** + * Second Cycle + * + */ + @XmlEnumValue("SecondCycle") + SECOND_CYCLE("SecondCycle"), - /** - * Third Cycle - * - */ - @XmlEnumValue("ThirdCycle") - THIRD_CYCLE("ThirdCycle"); - private final String value; + /** + * Third Cycle + * + */ + @XmlEnumValue("ThirdCycle") + THIRD_CYCLE("ThirdCycle"); + private final String value; - EHEAFrameworkType(String v) { - value = v; - } + EHEAFrameworkType(String v) { + value = v; + } - public String value() { - return value; - } + public String value() { + return value; + } - public static EHEAFrameworkType fromValue(String v) { - for (EHEAFrameworkType c: EHEAFrameworkType.values()) { - if (c.value.equals(v)) { - return c; - } - } - throw new IllegalArgumentException(v); - } + public static EHEAFrameworkType fromValue(String v) { + for (EHEAFrameworkType c : EHEAFrameworkType.values()) { + if (c.value.equals(v)) { + return c; + } + } + throw new IllegalArgumentException(v); + } } |