Author: berndf
Date: Tue May 26 07:07:44 2009
New Revision: 778580
URL: http://svn.apache.org/viewvc?rev=778580&view=rev
Log:
[vysper] encoder no longer static, add javadoc (VYSPER-62)
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoDataForm.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataForm.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoderTestCase.java
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoDataForm.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoDataForm.java?rev=778580&r1=778579&r2=778580&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoDataForm.java
(original)
+++
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoDataForm.java
Tue May 26 07:07:44 2009
@@ -15,10 +15,12 @@
public class InfoDataForm implements InfoElement {
private static final Integer CLASS_ID = new Integer(3);
+ protected static final DataFormEncoder DATA_FORM_ENCODER = new
DataFormEncoder();
+
protected XMLElement dataFormXML;
public InfoDataForm(DataForm dataForm) {
- dataFormXML = DataFormEncoder.getXML(dataForm);
+ dataFormXML = DATA_FORM_ENCODER.getXML(dataForm);
}
public Integer getElementClassId() {
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataForm.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataForm.java?rev=778580&r1=778579&r2=778580&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataForm.java
(original)
+++
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataForm.java
Tue May 26 07:07:44 2009
@@ -28,6 +28,9 @@
import java.util.List;
/**
+ * object model for data forms, according to XEP-0004, as used by many XMPP
extensions (and the core).
+ *
+ * to encode this model, use {...@link
org.apache.vysper.xmpp.stanza.dataforms.DataFormEncoder}
*/
@SpecCompliant(spec = "XEP-0004", status = ComplianceStatus.IN_PROGRESS,
coverage = ComplianceCoverage.PARTIAL)
public class DataForm {
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java?rev=778580&r1=778579&r2=778580&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java
(original)
+++
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java
Tue May 26 07:07:44 2009
@@ -30,11 +30,12 @@
import java.util.List;
/**
- * makes XMPP out of a Data Form
+ * makes XMPP out of a Data Form as provided by the model contained in a
{...@link org.apache.vysper.xmpp.stanza.dataforms.DataForm}
+ * instance.
*/
public class DataFormEncoder {
- public static XMLElement getXML(DataForm dataForm) {
+ public XMLElement getXML(DataForm dataForm) {
List<XMLFragment> childElements = new ArrayList<XMLFragment>();
@@ -88,7 +89,7 @@
return new XMLElement("x", NamespaceURIs.JABBER_X_DATA, attributes,
childElements);
}
- protected static XMLElement encodeField(Field field) {
+ protected XMLElement encodeField(Field field) {
ArrayList<XMLFragment> fieldElements = new ArrayList<XMLFragment>();
@@ -135,11 +136,11 @@
}
- protected static XMLElement createEmptyElement(String elementName) {
+ protected XMLElement createEmptyElement(String elementName) {
return new XMLElement(elementName, null, (Attribute[])null,
(XMLFragment[])null);
}
- protected static XMLElement createTextOnlyElement(String elementName,
String text) {
+ protected XMLElement createTextOnlyElement(String elementName, String
text) {
return new XMLElement(elementName, null, (Attribute[])null, new
XMLFragment[]{new XMLText(text)});
}
}
Modified:
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoderTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoderTestCase.java?rev=778580&r1=778579&r2=778580&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoderTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoderTestCase.java
Tue May 26 07:07:44 2009
@@ -43,7 +43,7 @@
field.addOption(new Option("2.", "due"));
form.addField(field);
- XMLElement formElement = DataFormEncoder.getXML(form);
+ XMLElement formElement = new DataFormEncoder().getXML(form);
XMLElementVerifier formElementVerifier = formElement.getVerifier();
formElementVerifier.nameEquals("x");
formElementVerifier.attributeEquals("type", "form");
@@ -66,7 +66,7 @@
form.setType(Type.cancel);
form.addField(new Field("label", HIDDEN, "var"));
- XMLElement formElement = DataFormEncoder.getXML(form);
+ XMLElement formElement = new DataFormEncoder().getXML(form);
assertTrue(formElement.getInnerElements().isEmpty());
