svn commit: r984999 - in /mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms: DataFormEncoder.java Field.java

[ng...@apache.org]

Author: ngn
Date: Thu Aug 12 21:45:42 2010
New Revision: 984999

URL: http://svn.apache.org/viewvc?rev=984999&view=rev
Log:
Only output <desc> for field element if set
Fix incorrect namespace prefix for data forms

Modified:
    mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java
    mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/Field.java

Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java?rev=984999&r1=984998&r2=984999&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java Thu Aug 12 21:45:42 2010
@@ -88,7 +88,7 @@ public class DataFormEncoder {
         List<Attribute> attributes = new ArrayList<Attribute>();
         attributes.add(new Attribute("type", dataForm.getType().value()));
 
-        return new XMLElement(NamespaceURIs.JABBER_X_DATA, "x", NamespaceURIs.JABBER_X_DATA, attributes, childElements);
+        return new XMLElement(NamespaceURIs.JABBER_X_DATA, "x", null, attributes, childElements);
     }
 
     protected XMLElement encodeField(Field field) {
@@ -106,11 +106,11 @@ public class DataFormEncoder {
             fieldAttributes.add(new Attribute("type", field.getType().value()));
         }
 
-        ArrayList<XMLFragment> descFragment = new ArrayList<XMLFragment>();
         if (field.getDesc() != null) {
+            ArrayList<XMLFragment> descFragment = new ArrayList<XMLFragment>();
             descFragment.add(new XMLText(field.getDesc()));
+            fieldElements.add(new XMLElement(NamespaceURIs.JABBER_X_DATA, "desc", null, null, descFragment));
         }
-        fieldElements.add(new XMLElement(NamespaceURIs.JABBER_X_DATA, "desc", null, null, descFragment));
 
         if (field.isRequired()) {
             fieldElements.add(createEmptyElement(NamespaceURIs.JABBER_X_DATA, "required"));

Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/Field.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/Field.java?rev=984999&r1=984998&r2=984999&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/Field.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/Field.java Thu Aug 12 21:45:42 2010
@@ -64,6 +64,20 @@ public class Field {
         this.var = var;
     }
 
+    /**
+     * Create field with a single value
+     * @param label The value of the  "label" attribute
+     * @param type The value of the "type" attribute
+     * @param var The value of the "var" attribute
+     * @param value The text of the initial "value" element
+     */
+    public Field(String label, Type type, String var, String value) {
+        this.label = label;
+        this.type = type;
+        this.var = var;
+        addValue(value);
+    }
+    
     public String getLabel() {
         return label;
     }