diff --git a/smack-core/src/integration-test/java/org/jivesoftware/smack/packet/MockPacket.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/packet/MockPacket.java
index 5d115a20c..cd24defcf 100644
--- a/smack-core/src/integration-test/java/org/jivesoftware/smack/packet/MockPacket.java
+++ b/smack-core/src/integration-test/java/org/jivesoftware/smack/packet/MockPacket.java
@@ -18,7 +18,7 @@
package org.jivesoftware.smack.packet;
/**
- * A mock implementation of the Stanza(/Packet) abstract class. Implements toXML() by returning null.
+ * A mock implementation of the Stanza abstract class. Implements toXML() by returning null.
*/
public class MockPacket extends Packet {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
index ac11fba9a..cb1939ec3 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
@@ -207,50 +207,50 @@ public interface XMPPConnection {
throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException;
/**
- * Creates a new stanza collector collecting packets that are replies to packet
.
- * Does also send packet
. The stanza filter for the collector is an
+ * Creates a new stanza collector collecting IQ responses that are replies to the IQ request
.
+ * Does also send the request
IQ. The stanza filter for the collector is an
* {@link IQReplyFilter}, guaranteeing that stanza id and JID in the 'from' address have
* expected values.
*
- * @param packet the stanza to filter responses from
+ * @param request the IQ request to filter responses from
* @return a new stanza collector.
* @throws NotConnectedException
* @throws InterruptedException
*/
- StanzaCollector createStanzaCollectorAndSend(IQ packet) throws NotConnectedException, InterruptedException;
+ StanzaCollector createStanzaCollectorAndSend(IQ request) throws NotConnectedException, InterruptedException;
/**
* Creates a new stanza collector for this connection. A stanza filter determines
- * which packets will be accumulated by the collector. A StanzaCollector is
+ * which stanzas will be accumulated by the collector. A StanzaCollector is
* more suitable to use than a {@link StanzaListener} when you need to wait for
* a specific result.
*
- * @param packetFilter the stanza filter to use.
- * @param packet the packet to send right after the collector got created
+ * @param stanzaFilter the stanza filter to use.
+ * @param stanza the stanza to send right after the collector got created
* @return a new stanza collector.
* @throws InterruptedException
* @throws NotConnectedException
*/
- StanzaCollector createStanzaCollectorAndSend(StanzaFilter packetFilter, Stanza packet)
+ StanzaCollector createStanzaCollectorAndSend(StanzaFilter stanzaFilter, Stanza stanza)
throws NotConnectedException, InterruptedException;
/**
* Creates a new stanza collector for this connection. A stanza filter
- * determines which packets will be accumulated by the collector. A
+ * determines which stanzas will be accumulated by the collector. A
* StanzaCollector is more suitable to use than a {@link StanzaListener}
* when you need to wait for a specific result.
*
- * Note: If you send a Stanza(/Packet) right after using this method, then + * Note: If you send a Stanza right after using this method, then * consider using * {@link #createStanzaCollectorAndSend(StanzaFilter, Stanza)} instead. * Otherwise make sure cancel the StanzaCollector in every case, e.g. even * if an exception is thrown, or otherwise you may leak the StanzaCollector. *
* - * @param packetFilter the stanza filter to use. + * @param stanzaFilter the stanza filter to use. * @return a new stanza collector. */ - StanzaCollector createStanzaCollector(StanzaFilter packetFilter); + StanzaCollector createStanzaCollector(StanzaFilter stanzaFilter); /** * Create a new stanza collector with the given stanza collector configuration. @@ -274,35 +274,35 @@ public interface XMPPConnection { /** * Registers a synchronous stanza listener with this connection. A stanza listener will be invoked only when - * an incoming stanza is received. A stanza filter determines which packets will be delivered to the listener. If + * an incoming stanza is received. A stanza filter determines which stanzas will be delivered to the listener. If * the same stanza listener is added again with a different filter, only the new filter will be used. ** Important: This stanza listeners will be called in the same single thread that processes all * incoming stanzas. Only use this kind of stanza filter if it does not perform any XMPP activity that waits for a * response. Consider using {@link #addAsyncStanzaListener(StanzaListener, StanzaFilter)} when possible, i.e. when - * the invocation order doesn't have to be the same as the order of the arriving packets. If the order of the - * arriving packets, consider using a {@link StanzaCollector} when possible. + * the invocation order doesn't have to be the same as the order of the arriving stanzas. If the order of the + * arriving stanzas, consider using a {@link StanzaCollector} when possible. *
* - * @param packetListener the stanza listener to notify of new received packets. - * @param packetFilter the stanza filter to use. + * @param stanzaListener the stanza listener to notify of new received stanzas. + * @param stanzaFilter the stanza filter to use. * @see #addStanzaInterceptor(StanzaListener, StanzaFilter) * @since 4.1 */ - void addSyncStanzaListener(StanzaListener packetListener, StanzaFilter packetFilter); + void addSyncStanzaListener(StanzaListener stanzaListener, StanzaFilter stanzaFilter); /** - * Removes a stanza listener for received packets from this connection. + * Removes a stanza listener for received stanzas from this connection. * - * @param packetListener the stanza listener to remove. + * @param stanzaListener the stanza listener to remove. * @return true if the stanza listener was removed * @since 4.1 */ - boolean removeSyncStanzaListener(StanzaListener packetListener); + boolean removeSyncStanzaListener(StanzaListener stanzaListener); /** * Registers an asynchronous stanza listener with this connection. A stanza listener will be invoked only - * when an incoming stanza is received. A stanza filter determines which packets will be delivered to the listener. + * when an incoming stanza is received. A stanza filter determines which stanzas will be delivered to the listener. * If the same stanza listener is added again with a different filter, only the new filter will be used. ** Unlike {@link #addAsyncStanzaListener(StanzaListener, StanzaFilter)} stanza listeners added with this method will be @@ -310,117 +310,117 @@ public interface XMPPConnection { * on the order how the stanzas where received. *
* - * @param packetListener the stanza listener to notify of new received packets. - * @param packetFilter the stanza filter to use. + * @param stanzaListener the stanza listener to notify of new received stanzas. + * @param stanzaFilter the stanza filter to use. * @see #addStanzaInterceptor(StanzaListener, StanzaFilter) * @since 4.1 */ - void addAsyncStanzaListener(StanzaListener packetListener, StanzaFilter packetFilter); + void addAsyncStanzaListener(StanzaListener stanzaListener, StanzaFilter stanzaFilter); /** - * Removes an asynchronous stanza listener for received packets from this connection. + * Removes an asynchronous stanza listener for received stanzas from this connection. * - * @param packetListener the stanza listener to remove. + * @param stanzaListener the stanza listener to remove. * @return true if the stanza listener was removed * @since 4.1 */ - boolean removeAsyncStanzaListener(StanzaListener packetListener); + boolean removeAsyncStanzaListener(StanzaListener stanzaListener); /** * Registers a stanza listener with this connection. The listener will be * notified of every stanza that this connection sends. A stanza filter determines - * which packets will be delivered to the listener. Note that the thread - * that writes packets will be used to invoke the listeners. Therefore, each + * which stanzas will be delivered to the listener. Note that the thread + * that writes stanzas will be used to invoke the listeners. Therefore, each * stanza listener should complete all operations quickly or use a different * thread for processing. * - * @param packetListener the stanza listener to notify of sent packets. - * @param packetFilter the stanza filter to use. + * @param stanzaListener the stanza listener to notify of sent stanzas. + * @param stanzaFilter the stanza filter to use. * @deprecated use {@link #addStanzaSendingListener} instead */ // TODO Remove in Smack 4.4 @Deprecated - void addPacketSendingListener(StanzaListener packetListener, StanzaFilter packetFilter); + void addPacketSendingListener(StanzaListener stanzaListener, StanzaFilter stanzaFilter); /** * Registers a stanza listener with this connection. The listener will be * notified of every stanza that this connection sends. A stanza filter determines - * which packets will be delivered to the listener. Note that the thread - * that writes packets will be used to invoke the listeners. Therefore, each + * which stanzas will be delivered to the listener. Note that the thread + * that writes stanzas will be used to invoke the listeners. Therefore, each * stanza listener should complete all operations quickly or use a different * thread for processing. * - * @param packetListener the stanza listener to notify of sent packets. - * @param packetFilter the stanza filter to use. + * @param stanzaListener the stanza listener to notify of sent stanzas. + * @param stanzaFilter the stanza filter to use. */ - void addStanzaSendingListener(StanzaListener packetListener, StanzaFilter packetFilter); + void addStanzaSendingListener(StanzaListener stanzaListener, StanzaFilter stanzaFilter); /** - * Removes a stanza listener for sending packets from this connection. + * Removes a stanza listener for sending stanzas from this connection. * - * @param packetListener the stanza listener to remove. + * @param stanzaListener the stanza listener to remove. * @deprecated use {@link #removeStanzaSendingListener} instead */ // TODO Remove in Smack 4.4 @Deprecated - void removePacketSendingListener(StanzaListener packetListener); + void removePacketSendingListener(StanzaListener stanzaListener); /** - * Removes a stanza listener for sending packets from this connection. + * Removes a stanza listener for sending stanzas from this connection. * - * @param packetListener the stanza listener to remove. + * @param stanzaListener the stanza listener to remove. */ - void removeStanzaSendingListener(StanzaListener packetListener); + void removeStanzaSendingListener(StanzaListener stanzaListener); /** * Registers a stanza interceptor with this connection. The interceptor will be * invoked every time a stanza is about to be sent by this connection. Interceptors - * may modify the stanza to be sent. A stanza filter determines which packets + * may modify the stanza to be sent. A stanza filter determines which stanzas * will be delivered to the interceptor. * *- * NOTE: For a similar functionality on incoming packets, see {@link #addAsyncStanzaListener(StanzaListener, StanzaFilter)}. + * NOTE: For a similar functionality on incoming stanzas, see {@link #addAsyncStanzaListener(StanzaListener, StanzaFilter)}. *
* - * @param packetInterceptor the stanza interceptor to notify of packets about to be sent. - * @param packetFilter the stanza filter to use. + * @param stanzaInterceptor the stanza interceptor to notify of stanzas about to be sent. + * @param stanzaFilter the stanza filter to use. * @deprecated use {@link #addStanzaInterceptor} instead */ // TODO Remove in Smack 4.4 @Deprecated - void addPacketInterceptor(StanzaListener packetInterceptor, StanzaFilter packetFilter); + void addPacketInterceptor(StanzaListener stanzaInterceptor, StanzaFilter stanzaFilter); /** * Registers a stanza interceptor with this connection. The interceptor will be * invoked every time a stanza is about to be sent by this connection. Interceptors - * may modify the stanza to be sent. A stanza filter determines which packets + * may modify the stanza to be sent. A stanza filter determines which stanzas * will be delivered to the interceptor. * *- * NOTE: For a similar functionality on incoming packets, see {@link #addAsyncStanzaListener(StanzaListener, StanzaFilter)}. + * NOTE: For a similar functionality on incoming stanzas, see {@link #addAsyncStanzaListener(StanzaListener, StanzaFilter)}. *
* - * @param packetInterceptor the stanza interceptor to notify of packets about to be sent. - * @param packetFilter the stanza filter to use. + * @param stanzaInterceptor the stanza interceptor to notify of stanzas about to be sent. + * @param stanzaFilter the stanza filter to use. */ - void addStanzaInterceptor(StanzaListener packetInterceptor, StanzaFilter packetFilter); + void addStanzaInterceptor(StanzaListener stanzaInterceptor, StanzaFilter stanzaFilter); /** * Removes a stanza interceptor. * - * @param packetInterceptor the stanza interceptor to remove. + * @param stanzaInterceptor the stanza interceptor to remove. * @deprecated user {@link #removeStanzaInterceptor} instead */ // TODO Remove in Smack 4.4 @Deprecated - void removePacketInterceptor(StanzaListener packetInterceptor); + void removePacketInterceptor(StanzaListener stanzaInterceptor); /** * Removes a stanza interceptor. * - * @param packetInterceptor the stanza interceptor to remove. + * @param stanzaInterceptor the stanza interceptor to remove. */ - void removeStanzaInterceptor(StanzaListener packetInterceptor); + void removeStanzaInterceptor(StanzaListener stanzaInterceptor); /** * Returns the current value of the reply timeout in milliseconds for request for this @@ -662,9 +662,9 @@ public interface XMPPConnection { * stanza filter. * * @param callback the callback invoked once the stanza filter matches a stanza. - * @param packetFilter the filter to match stanzas or null to match all. + * @param stanzaFilter the filter to match stanzas or null to match all. */ - void addOneTimeSyncCallback(StanzaListener callback, StanzaFilter packetFilter); + void addOneTimeSyncCallback(StanzaListener callback, StanzaFilter stanzaFilter); /** * Register an IQ request handler with this connection. diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java index bef397d59..10f9b834f 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java @@ -18,7 +18,7 @@ package org.jivesoftware.smack.filter; /** - * Defines a way to filter packets for particular attributes. Stanza(/Packet) filters are used when + * Defines a way to filter packets for particular attributes. Stanza filters are used when * constructing stanza listeners or collectors -- the filter defines what packets match the criteria * of the collector or listener for further stanza processing. *diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java index 53672167d..032814d52 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java @@ -161,7 +161,7 @@ public interface Packet extends TopLevelStreamElement { /** * Returns the first stanza extension that matches the specified element name and * namespace, or null if it doesn't exist. If the provided elementName is null, - * only the namespace is matched. Stanza(/Packet) extensions are + * only the namespace is matched. Stanza extensions are * are arbitrary XML sub-documents in standard XMPP packets. By default, a * DefaultPacketExtension instance will be returned for each extension. However, * PacketExtensionProvider instances can be registered with the diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java index 11f4088ad..359f6da4a 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java @@ -34,7 +34,7 @@ import org.jxmpp.stringprep.XmppStringprepException; import org.jxmpp.util.XmppStringUtils; /** - * Base class for XMPP Stanzas, which are called Stanza(/Packet) in older versions of Smack (i.e. < 4.1). + * Base class for XMPP Stanzas, which are called Stanza in older versions of Smack (i.e. < 4.1). *
* Every stanza has a unique ID (which is automatically generated, but can be overridden). Stanza * IDs are required for IQ stanzas and recommended for presence and message stanzas. Optionally, the diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java index 9b891caa1..1587996c0 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java @@ -23,7 +23,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder; import org.jivesoftware.smackx.forward.packet.Forwarded; /** - * Stanza(/Packet) extension for XEP-0280: Message Carbons. The extension + * Stanza extension for XEP-0280: Message Carbons. The extension * XEP-0280 is * meant to synchronize a message flow to multiple presences of a user. * @@ -129,7 +129,7 @@ public class CarbonExtension implements ExtensionElement { } /** - * Stanza(/Packet) extension indicating that a message may not be carbon-copied. Adding this + * Stanza extension indicating that a message may not be carbon-copied. Adding this * extension to any message will disallow that message from being copied. */ public static final class Private implements ExtensionElement { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java index 6b307f70e..29da4bb75 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java @@ -23,7 +23,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder; import org.jivesoftware.smackx.hoxt.HOXTManager; /** - * Stanza(/Packet) extension for base64 binary chunks.
+ * Stanza extension for base64 binary chunks.
* This class is immutable. * * @author Andriy Tsykholyas diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java index 9755d9d52..fee0ca464 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java @@ -26,7 +26,7 @@ import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; /** - * Stanza(/Packet) provider for base64 binary chunks. + * Stanza provider for base64 binary chunks. * * @author Andriy Tsykholyas * @see XEP-0332: HTTP over XMPP transport diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java index e221d8eb1..fd281b396 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java @@ -289,7 +289,7 @@ public class MultipleRecipientManager { } /** - * Stanza(/Packet) that holds the XML stanza to send. This class is useful when the same packet + * Stanza that holds the XML stanza to send. This class is useful when the same packet * is needed to be sent to different recipients. Since using the same stanza is not possible * (i.e. cannot change the TO address of a queues stanza to be sent) then this class was * created to keep the XML stanza to send. diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java index 12a05ce86..37790a6e0 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java @@ -27,7 +27,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder; import org.jxmpp.jid.Jid; /** - * Stanza(/Packet) extension that contains the list of addresses that a stanza should be sent or was sent. + * Stanza extension that contains the list of addresses that a stanza should be sent or was sent. * * @author Gaston Dombiak */ diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java index 30048a7e8..113533c4b 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java @@ -694,7 +694,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream * Specified in XEP-65 5.3.1 (Example 13) *
* - * @param packet Stanza(/Packet) that should be answered with a not-acceptable error + * @param packet Stanza that should be answered with a not-acceptable error * @throws NotConnectedException * @throws InterruptedException */ diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java index addd9c1c3..ae415fc16 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java @@ -260,7 +260,7 @@ public class Bytestream extends IQ { } /** - * Stanza(/Packet) extension that represents a potential SOCKS5 proxy for the file transfer. Stream hosts + * Stanza extension that represents a potential SOCKS5 proxy for the file transfer. Stream hosts * are forwarded to the target of the file transfer who then chooses and connects to one. * * @author Alexander Wenckus diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java index 05cd2371b..afbf4aa6e 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java @@ -1024,7 +1024,7 @@ public class MultiUserChat { /** * Adds a new {@link StanzaListener} that will be invoked every time a new presence - * is going to be sent by this MultiUserChat to the server. Stanza(/Packet) interceptors may + * is going to be sent by this MultiUserChat to the server. Stanza interceptors may * add new extensions to the presence that is going to be sent to the MUC service. * * @param presenceInterceptor the new stanza interceptor that will intercept presence packets. @@ -1035,7 +1035,7 @@ public class MultiUserChat { /** * Removes a {@link StanzaListener} that was being invoked every time a new presence - * was being sent by this MultiUserChat to the server. Stanza(/Packet) interceptors may + * was being sent by this MultiUserChat to the server. Stanza interceptors may * add new extensions to the presence that is going to be sent to the MUC service. * * @param presenceInterceptor the stanza interceptor to remove. diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java index 2da32e222..692d56446 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java @@ -56,7 +56,7 @@ import org.jxmpp.jid.Jid; * *
* deliveryReceiptManager.addReceiptReceivedListener(new ReceiptReceivedListener() {
- * void onReceiptReceived(String fromJid, String toJid, String receiptId, Stanza(/Packet) receipt) {
+ * void onReceiptReceived(String fromJid, String toJid, String receiptId, Stanza receipt) {
* // If the receiving entity does not support delivery receipts,
* // then the receipt received listener may not get invoked.
* }
@@ -296,7 +296,7 @@ public final class DeliveryReceiptManager extends Manager {
/**
* Test if a message requires a delivery receipt.
*
- * @param message Stanza(/Packet) object to check for a DeliveryReceiptRequest
+ * @param message Stanza object to check for a DeliveryReceiptRequest
*
* @return true if a delivery receipt was requested
*/
diff --git a/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java b/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java
index 097f2fefc..e7ebf7a49 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java
@@ -57,7 +57,7 @@ public class ConnectionUtils {
*
* StanzaCollector collector = connection.createStanzaCollector(new PacketFilter());
* connection.sendStanza(packet);
- * Stanza(/Packet) reply = collector.nextResult();
+ * Stanza reply = collector.nextResult();
*
*
*
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java
index b382d9f1c..0c634879a 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java
@@ -42,7 +42,7 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
- * RTPBridge IQ Stanza(/Packet) used to request and retrieve a RTPBridge Candidates that can be used for a Jingle Media Transmission between two parties that are behind NAT.
+ * RTPBridge IQ Stanza used to request and retrieve a RTPBridge Candidates that can be used for a Jingle Media Transmission between two parties that are behind NAT.
* This Jingle Bridge has all the needed information to establish a full UDP Channel (Send and Receive) between two parties.
* This transport method should be used only if other transport methods are not allowed. Or if you want a more reliable transport.
*
@@ -123,7 +123,7 @@ public class RTPBridge extends IQ {
}
/**
- * Creates a RTPBridge Stanza(/Packet) without Session ID.
+ * Creates a RTPBridge Stanza without Session ID.
*/
public RTPBridge() {
super(ELEMENT_NAME, NAMESPACE);
@@ -157,7 +157,7 @@ public class RTPBridge extends IQ {
}
/**
- * Get the Session ID of the Stanza(/Packet) (usually same as Jingle Session ID).
+ * Get the Session ID of the Stanza (usually same as Jingle Session ID).
*
* @return the session ID
*/
@@ -166,7 +166,7 @@ public class RTPBridge extends IQ {
}
/**
- * Set the Session ID of the Stanza(/Packet) (usually same as Jingle Session ID).
+ * Set the Session ID of the Stanza (usually same as Jingle Session ID).
*
* @param sid
*/
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java
index f4fb608b8..1c5e1e2e3 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java
@@ -38,7 +38,7 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
- * STUN IQ Stanza(/Packet) used to request and retrieve a STUN server and port to make p2p connections easier. STUN is usually used by Jingle Media Transmission between two parties that are behind NAT.
+ * STUN IQ Stanza used to request and retrieve a STUN server and port to make p2p connections easier. STUN is usually used by Jingle Media Transmission between two parties that are behind NAT.
*
* High Level Usage Example:
*
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java
index 2f51b6cea..4b200d0b1 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java
@@ -192,7 +192,7 @@ public class Offer {
}
/**
- * Stanza(/Packet) for rejecting offers.
+ * Stanza for rejecting offers.
*/
private class RejectPacket extends IQ {
@@ -211,7 +211,7 @@ public class Offer {
}
/**
- * Stanza(/Packet) for accepting an offer.
+ * Stanza for accepting an offer.
*/
private class AcceptPacket extends IQ {
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
index b4eb6fa9d..e3a928d3b 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
@@ -97,7 +97,7 @@ public class OfferConfirmation extends SimpleIQ {
/**
- * Stanza(/Packet) for notifying server of RoomName
+ * Stanza for notifying server of RoomName
*/
private static class NotifyServicePacket extends IQ {
String roomName;
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
index 7f4eae815..b80032cb7 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
@@ -88,7 +88,7 @@ public class AgentChatHistory extends IQ {
}
/**
- * Stanza(/Packet) extension provider for AgentHistory packets.
+ * Stanza extension provider for AgentHistory packets.
*/
public static class InternalProvider extends IQProvider