Swiftdiff options
| author | Alex Clayton <alex.clayton@isode.com> | 2016-03-21 16:22:56 (GMT) |
|---|---|---|
| committer | Alex Clayton <alex.clayton@isode.com> | 2016-03-22 11:32:44 (GMT) |
| commit | 9b518dcdd98d694a4464895fce17a3c7a8caf569 (patch) | |
| tree | f585f40f6ac0c0d829015c68d6d8c8169a4fb252 | |
| parent | 0ec7a2d8ab803b0e2df2c616f61d2b69b042561f (diff) | |
| download | stroke-9b518dcdd98d694a4464895fce17a3c7a8caf569.zip stroke-9b518dcdd98d694a4464895fce17a3c7a8caf569.tar.bz2 | |
Tidy XEP-0141 code
As per swiften patch of the same name.
This change addresses some feedback the previous XEP-0141 commit.
Test-information: Unit tests stil pass.
Change-Id: I3a9f9ec93b56352418f8288371bbd6874e01310d
3 files changed, 8 insertions, 17 deletions
diff --git a/src/com/isode/stroke/elements/FormPage.java b/src/com/isode/stroke/elements/FormPage.java index b23a6e2..ffb35a9 100644 --- a/src/com/isode/stroke/elements/FormPage.java +++ b/src/com/isode/stroke/elements/FormPage.java @@ -1,8 +1,8 @@ /* - * Copyright (c) 2015 Isode Limited. + * Copyright (c) 2015-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ /* * Copyright (c) 2015 Tarun Gupta. * Licensed under the simplified BSD license. @@ -18,24 +18,23 @@ import com.isode.stroke.elements.FormText; import com.isode.stroke.elements.FormSection; import java.util.Vector; public class FormPage { private String label_ = ""; - private String xmlns_ = ""; private Vector<FormText> textElements_ = new Vector<FormText>(); private Vector<FormReportedRef> reportedRefs_ = new Vector<FormReportedRef>(); private Vector<FormSection> childSections_ = new Vector<FormSection>(); private Vector<FormField> fields_ = new Vector<FormField>(); private Vector<String> fieldRefs_ = new Vector<String>(); /** * Default Constructor. */ public FormPage() { - this.xmlns_ = "http://jabber.org/protocol/xdata-layout"; + } /** * @param label, Not Null. */ public void setLabel(String label) { @@ -48,19 +47,12 @@ public class FormPage { */ public String getLabel() { return label_; } /** - * @return xmlns, Not Null. - */ - public String getXMLNS() { - return xmlns_; - } - - /** * @param textElement, Not Null. */ public void addTextElement(FormText textElement) { NotNull.exceptIfNull(textElement, "textElement"); textElements_.add(textElement); } diff --git a/src/com/isode/stroke/parser/payloadparsers/FormParser.java b/src/com/isode/stroke/parser/payloadparsers/FormParser.java index ab14a4e..bbb04c0 100644 --- a/src/com/isode/stroke/parser/payloadparsers/FormParser.java +++ b/src/com/isode/stroke/parser/payloadparsers/FormParser.java @@ -35,13 +35,12 @@ public class FormParser extends GenericPayloadParser<Form> { private boolean parsingReported_ = false; private boolean parsingOption_ = false; private String currentOptionValue_ = ""; private String currentText_ = ""; private String currentFieldRef_ = ""; private boolean parsingItem_ = false; - private boolean parseStarted_ = false; private boolean hasReportedRef_ = false; private FormText currentTextElement_; private FormReportedRef currentReportedRef_; private FormPage currentPage_; private FormSection currentSection_; private List<FormPage> currentPages_ = new ArrayList<FormPage>(); @@ -239,21 +238,21 @@ public class FormParser extends GenericPayloadParser<Form> { else if (parsingItem_) { currentFields_.add(currentField_); } else { if (currentPages_.size() > 0) { for (FormPage page : currentPages_) { - for (String pRef : page.getFieldRefs()) { - if (pRef.equals(currentField_.getName())) { + for (String pageRef : page.getFieldRefs()) { + if (pageRef.equals(currentField_.getName())) { page.addField(currentField_); } } } for (FormSection section : currentSections_) { - for (String sRef : section.getFieldRefs()) { - if (sRef.equals(currentField_.getName())) { + for (String sectionRef : section.getFieldRefs()) { + if (sectionRef.equals(currentField_.getName())) { section.addField(currentField_); } } } } else { form.addField(currentField_); @@ -267,13 +266,13 @@ public class FormParser extends GenericPayloadParser<Form> { if (sectionStack_.size() > 1) { // Add the section at the top of the stack to the level below sectionStack_.get(sectionStack_.size()-2).addChildSection(sectionStack_.get(sectionStack_.size()-1)); sectionStack_.remove(sectionStack_.size()-1); } else if (sectionStack_.size() == 1) { - // Add the remaining section on the stack to it's parent page + // Add the remaining section on the stack to its parent page currentPage_.addChildSection(sectionStack_.get(sectionStack_.size()-1)); sectionStack_.remove(sectionStack_.size()-1); } } if (currentReportedRef_ != null && !hasReportedRef_) { if (sectionStack_.size() > 0) { diff --git a/src/com/isode/stroke/serializer/payloadserializers/FormSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/FormSerializer.java index 262ba3d..4cd80c9 100644 --- a/src/com/isode/stroke/serializer/payloadserializers/FormSerializer.java +++ b/src/com/isode/stroke/serializer/payloadserializers/FormSerializer.java @@ -150,13 +150,13 @@ public class FormSerializer extends GenericPayloadSerializer<Form> { /*private XMLElement reportedRefToXML(FormReportedRef reportedRef) { }*/ private XMLElement pageToXML(FormPage page) { XMLElement pageElement = new XMLElement("page"); - pageElement.setAttribute("xmlns", page.getXMLNS()); + pageElement.setAttribute("xmlns","http://jabber.org/protocol/xdata-layout"); if (!page.getLabel().isEmpty()) { pageElement.setAttribute("label", page.getLabel()); } for(FormText text : page.getTextElements()) { pageElement.addNode(textToXML(text)); } |