vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-12-14 15:01:07 +01:00
Code Issues Releases Wiki Activity

Merge branch '4.1'

Browse source 
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
	smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
	version.gradle
This commit is contained in:
Florian Schmaus 2015-03-24 17:16:18 +01:00
commit 83b84c5bd3
168 changed files with 780 additions and 687 deletions
Download patch file Download diff file Expand all files Collapse all files

6
smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java
View file

@ -46,11 +46,11 @@ public class Form {
private DataForm dataForm;
/**
* Returns a new ReportedData if the packet is used for gathering data and includes an
* Returns a new ReportedData if the stanza(/packet) is used for gathering data and includes an
* extension that matches the elementName and namespace "x","jabber:x:data".
*
* @param packet the packet used for gathering data.
* @return the data form parsed from the packet or <tt>null</tt> if there was not
* @param packet the stanza(/packet) used for gathering data.
* @return the data form parsed from the stanza(/packet) or <tt>null</tt> if there was not
* a form in the packet.
*/
public static Form getFormFrom(Stanza packet) {

2
smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java
View file

@ -41,7 +41,7 @@ public class DataForm implements ExtensionElement {
public enum Type {
/**
* This packet contains a form to fill out. Display it to the user (if your program can).
* This stanza(/packet) contains a form to fill out. Display it to the user (if your program can).
*/
form,