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/AddressType.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/AddressType.java')
-rw-r--r-- | id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AddressType.java | 427 |
1 files changed, 200 insertions, 227 deletions
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AddressType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AddressType.java index 044801564..044fd0a04 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AddressType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AddressType.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; @@ -17,13 +16,14 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; - /** * Address * - * <p>Java class for AddressType complex type. + * <p> + * Java class for AddressType 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="AddressType"> @@ -52,230 +52,203 @@ import javax.xml.bind.annotation.XmlValue; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "AddressType", propOrder = { - "line", - "city", - "stateOrRegion", - "postalCode", - "country" -}) +@XmlType(name = "AddressType", propOrder = { "line", "city", "stateOrRegion", "postalCode", "country" }) public class AddressType { - @XmlElement(name = "Line", required = true) - protected List<String> line; - @XmlElement(name = "City", required = true) - protected String city; - @XmlElement(name = "StateOrRegion", required = true) - protected String stateOrRegion; - @XmlElement(name = "PostalCode", required = true) - protected String postalCode; - @XmlElement(name = "Country", required = true) - protected AddressType.Country country; - - /** - * Gets the value of the line 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 line property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getLine().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List<String> getLine() { - if (line == null) { - line = new ArrayList<String>(); - } - return this.line; - } - - /** - * Gets the value of the city property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCity() { - return city; - } - - /** - * Sets the value of the city property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCity(String value) { - this.city = value; - } - - /** - * Gets the value of the stateOrRegion property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getStateOrRegion() { - return stateOrRegion; - } - - /** - * Sets the value of the stateOrRegion property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setStateOrRegion(String value) { - this.stateOrRegion = value; - } - - /** - * Gets the value of the postalCode property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPostalCode() { - return postalCode; - } - - /** - * Sets the value of the postalCode property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPostalCode(String value) { - this.postalCode = value; - } - - /** - * Gets the value of the country property. - * - * @return - * possible object is - * {@link AddressType.Country } - * - */ - public AddressType.Country getCountry() { - return country; - } - - /** - * Sets the value of the country property. - * - * @param value - * allowed object is - * {@link AddressType.Country } - * - */ - public void setCountry(AddressType.Country value) { - this.country = value; - } - - - /** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <simpleContent> - * <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType"> - * <attribute name="country" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" /> - * </extension> - * </simpleContent> - * </complexType> - * </pre> - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Country { - - @XmlValue - protected String value; - @XmlAttribute(name = "country", required = true) - protected CountryType country; - - /** - * Plain text constraint - * - * Non empty text - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the country property. - * - * @return - * possible object is - * {@link CountryType } - * - */ - public CountryType getCountry() { - return country; - } - - /** - * Sets the value of the country property. - * - * @param value - * allowed object is - * {@link CountryType } - * - */ - public void setCountry(CountryType value) { - this.country = value; - } - - } + @XmlElement(name = "Line", required = true) + protected List<String> line; + @XmlElement(name = "City", required = true) + protected String city; + @XmlElement(name = "StateOrRegion", required = true) + protected String stateOrRegion; + @XmlElement(name = "PostalCode", required = true) + protected String postalCode; + @XmlElement(name = "Country", required = true) + protected AddressType.Country country; + + /** + * Gets the value of the line 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 line property. + * + * <p> + * For example, to add a new item, do as follows: + * + * <pre> + * getLine().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list {@link String } + * + * + */ + public List<String> getLine() { + if (line == null) { + line = new ArrayList<String>(); + } + return this.line; + } + + /** + * Gets the value of the city property. + * + * @return possible object is {@link String } + * + */ + public String getCity() { + return city; + } + + /** + * Sets the value of the city property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setCity(String value) { + this.city = value; + } + + /** + * Gets the value of the stateOrRegion property. + * + * @return possible object is {@link String } + * + */ + public String getStateOrRegion() { + return stateOrRegion; + } + + /** + * Sets the value of the stateOrRegion property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setStateOrRegion(String value) { + this.stateOrRegion = value; + } + + /** + * Gets the value of the postalCode property. + * + * @return possible object is {@link String } + * + */ + public String getPostalCode() { + return postalCode; + } + + /** + * Sets the value of the postalCode property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setPostalCode(String value) { + this.postalCode = value; + } + + /** + * Gets the value of the country property. + * + * @return possible object is {@link AddressType.Country } + * + */ + public AddressType.Country getCountry() { + return country; + } + + /** + * Sets the value of the country property. + * + * @param value + * allowed object is {@link AddressType.Country } + * + */ + public void setCountry(AddressType.Country value) { + this.country = value; + } + + /** + * <p> + * Java class for anonymous complex type. + * + * <p> + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType> + * <simpleContent> + * <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType"> + * <attribute name="country" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" /> + * </extension> + * </simpleContent> + * </complexType> + * </pre> + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class Country { + + @XmlValue + protected String value; + @XmlAttribute(name = "country", required = true) + protected CountryType country; + + /** + * Plain text constraint + * + * Non empty text + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the country property. + * + * @return possible object is {@link CountryType } + * + */ + public CountryType getCountry() { + return country; + } + + /** + * Sets the value of the country property. + * + * @param value + * allowed object is {@link CountryType } + * + */ + public void setCountry(CountryType value) { + this.country = value; + } + + } } |