Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-09-09 10:19:41 +02: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

12
smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
View file

@ -794,10 +794,10 @@ public class EnhancedDebugger implements SmackDebugger {
}
/**
* Adds the received packet detail to the messages table.
* Adds the received stanza(/packet) detail to the messages table.
*
* @param dateFormatter the SimpleDateFormat to use to format Dates
* @param packet the read packet to add to the table
* @param packet the read stanza(/packet) to add to the table
*/
private void addReadPacketToTable(final SimpleDateFormat dateFormatter, final Stanza packet) {
SwingUtilities.invokeLater(new Runnable() {
@ -855,10 +855,10 @@ public class EnhancedDebugger implements SmackDebugger {
}
/**
* Adds the sent packet detail to the messages table.
* Adds the sent stanza(/packet) detail to the messages table.
*
* @param dateFormatter the SimpleDateFormat to use to format Dates
* @param packet the sent packet to add to the table
* @param packet the sent stanza(/packet) to add to the table
*/
private void addSentPacketToTable(final SimpleDateFormat dateFormatter, final Stanza packet) {
SwingUtilities.invokeLater(new Runnable() {
@ -972,7 +972,7 @@ public class EnhancedDebugger implements SmackDebugger {
}
/**
* An ad-hoc packet is like any regular packet but with the exception that it's intention is
* An ad-hoc stanza(/packet) is like any regular stanza(/packet) but with the exception that it's intention is
* to be used only <b>to send packets</b>.<p>
* <p/>
* The whole text to send must be passed to the constructor. This implies that the client of
@ -986,7 +986,7 @@ public class EnhancedDebugger implements SmackDebugger {
* Create a new AdHocPacket with the text to send. The passed text must be a valid text to
* send to the server, no validation will be done on the passed text.
*
* @param text the whole text of the packet to send
* @param text the whole text of the stanza(/packet) to send
*/
public AdHocPacket(String text) {
this.text = text;