Merge branch 'trz/rebase' into trz/rename

1 files changed, 15 insertions, 5 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/forms/Data.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/forms/Data.java
index 591d8ada..cb612a07 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/forms/Data.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/forms/Data.java
@@ -53,16 +53,16 @@ public class Data extends Element {
 
 	public void submit() {
 		this.setAttribute("type","submit");
-		removeNonFieldChildren();
+		removeUnnecessaryChildren();
 		for(Field field : getFields()) {
 			field.removeNonValueChildren();
 		}
 	}
 
-	private void removeNonFieldChildren() {
+	private void removeUnnecessaryChildren() {
 		for(Iterator<Element> iterator = this.children.iterator(); iterator.hasNext();) {
 			Element element = iterator.next();
-			if (!element.getName().equals("field")) {
+			if (!element.getName().equals("field") && !element.getName().equals("title")) {
 				iterator.remove();
 			}
 		}
@@ -76,10 +76,20 @@ public class Data extends Element {
 	}
 
 	public void setFormType(String formType) {
-		this.put("FORM_TYPE",formType);
+		this.put("FORM_TYPE", formType);
 	}
 
 	public String getFormType() {
-		return this.getAttribute("FORM_TYPE");
+		String type = getValue("FORM_TYPE");
+		return type == null ? "" : type;
+	}
+
+	public String getValue(String name) {
+		Field field = this.getFieldByName(name);
+		return field == null ? null : field.getValue();
+	}
+
+	public String getTitle() {
+		return findChildContent("title");
 	}
 }