From 6560a6194c05c2a14b6a3c3636c758e92d524006 Mon Sep 17 00:00:00 2001 From: Jason Harrop Date: Wed, 21 Aug 2013 11:46:11 +1000 Subject: [PATCH] - correct typo in @description - add @source (for consistency, though not necessary server-side) --- .../org/opendope/conditions/Condition.java | 45 +++++++++++++++---- xsd/OpenDoPE/conditions.xsd | 4 +- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/opendope/conditions/Condition.java b/src/main/java/org/opendope/conditions/Condition.java index 03874d44be..e743172f2d 100644 --- a/src/main/java/org/opendope/conditions/Condition.java +++ b/src/main/java/org/opendope/conditions/Condition.java @@ -47,8 +47,9 @@ * </choice> * <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" /> * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="descrption" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="comments" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> * </complexType> @@ -77,10 +78,12 @@ public class Condition implements Evaluable { protected String id; @XmlAttribute(name = "name") protected String name; - @XmlAttribute(name = "descrption") - protected String descrption; + @XmlAttribute(name = "description") + protected String description; @XmlAttribute(name = "comments") protected String comments; + @XmlAttribute(name = "source") + protected String source; /** * Gets the value of the particle property. @@ -212,27 +215,27 @@ public void setName(String value) { } /** - * Gets the value of the descrption property. + * Gets the value of the description property. * * @return * possible object is * {@link String } * */ - public String getDescrption() { - return descrption; + public String getDescription() { + return description; } /** - * Sets the value of the descrption property. + * Sets the value of the description property. * * @param value * allowed object is * {@link String } * */ - public void setDescrption(String value) { - this.descrption = value; + public void setDescription(String value) { + this.description = value; } /** @@ -259,4 +262,28 @@ public void setComments(String value) { this.comments = value; } + /** + * Gets the value of the source property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSource() { + return source; + } + + /** + * Sets the value of the source property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSource(String value) { + this.source = value; + } + } diff --git a/xsd/OpenDoPE/conditions.xsd b/xsd/OpenDoPE/conditions.xsd index e961d4093d..2b6641a135 100644 --- a/xsd/OpenDoPE/conditions.xsd +++ b/xsd/OpenDoPE/conditions.xsd @@ -65,8 +65,10 @@ JAXB INSTRUCTIONS - + + +