Merge branch '4.2'

smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java

@@ -363,14 +363,14 @@ public class AgentSession {
      * Sets the agent's current status with the workgroup. The presence mode affects
      * how offers are routed to the agent. The possible presence modes with their
      * meanings are as follows:<ul>
-     * <p/>
+     *
      * <li>Presence.Mode.AVAILABLE -- (Default) the agent is available for more chats
      * (equivalent to Presence.Mode.CHAT).
      * <li>Presence.Mode.DO_NOT_DISTURB -- the agent is busy and should not be disturbed.
      * However, special case, or extreme urgency chats may still be offered to the agent.
      * <li>Presence.Mode.AWAY -- the agent is not available and should not
      * have a chat routed to them (equivalent to Presence.Mode.EXTENDED_AWAY).</ul>
-     * <p/>
+     *
      * The max chats value is the maximum number of chats the agent is willing to have
      * routed to them at once. Some servers may be configured to only accept max chat
      * values in a certain range; for example, between two and five. In that case, the
@@ -391,14 +391,14 @@ public class AgentSession {
     /**
      * Sets the agent's current status with the workgroup. The presence mode affects how offers
      * are routed to the agent. The possible presence modes with their meanings are as follows:<ul>
-     * <p/>
+     *
      * <li>Presence.Mode.AVAILABLE -- (Default) the agent is available for more chats
      * (equivalent to Presence.Mode.CHAT).
      * <li>Presence.Mode.DO_NOT_DISTURB -- the agent is busy and should not be disturbed.
      * However, special case, or extreme urgency chats may still be offered to the agent.
      * <li>Presence.Mode.AWAY -- the agent is not available and should not
      * have a chat routed to them (equivalent to Presence.Mode.EXTENDED_AWAY).</ul>
-     * <p/>
+     *
      * The max chats value is the maximum number of chats the agent is willing to have routed to
      * them at once. Some servers may be configured to only accept max chat values in a certain
      * range; for example, between two and five. In that case, the maxChats value the agent sends
@@ -450,7 +450,7 @@ public class AgentSession {
     /**
      * Sets the agent's current status with the workgroup. The presence mode affects how offers
      * are routed to the agent. The possible presence modes with their meanings are as follows:<ul>
-     * <p/>
+     *
      * <li>Presence.Mode.AVAILABLE -- (Default) the agent is available for more chats
      * (equivalent to Presence.Mode.CHAT).
      * <li>Presence.Mode.DO_NOT_DISTURB -- the agent is busy and should not be disturbed.
@@ -493,7 +493,7 @@ public class AgentSession {
 
     /**
      * Removes a user from the workgroup queue. This is an administrative action that the
-     * <p/>
+     *
      * The agent is not guaranteed of having privileges to perform this action; an exception
      * denying the request may be thrown.
      *

smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java

@@ -68,7 +68,7 @@ import org.jxmpp.jid.Jid;
  * Provides workgroup services for users. Users can join the workgroup queue, depart the
  * queue, find status information about their placement in the queue, and register to
  * be notified when they are routed to an agent.<p>
- * <p/>
+ *
  * This class only provides a users perspective into a workgroup and is not intended
  * for use by agents.
  *
@@ -232,20 +232,20 @@ public class Workgroup {
      * the queue, queue status events will be sent to indicate the user's position and
      * estimated time left in the queue. Once joining the queue, there are three ways
      * the user can leave the queue: <ul>
-     * <p/>
+     *
      * <li>The user is routed to an agent, which triggers a GroupChat invitation.
      * <li>The user asks to leave the queue by calling the {@link #departQueue} method.
      * <li>A server error occurs, or an administrator explicitly removes the user
      * from the queue.
      * </ul>
-     * <p/>
+     *
      * A user cannot request to join the queue again if already in the queue. Therefore,
      * this method will throw an IllegalStateException if the user is already in the queue.<p>
-     * <p/>
+     *
      * Some servers may be configured to require certain meta-data in order to
      * join the queue. In that case, the {@link #joinQueue(Form)} method should be
      * used instead of this method so that meta-data may be passed in.<p>
-     * <p/>
+     *
      * The server tracks the conversations that a user has with agents over time. By
      * default, that tracking is done using the user's JID. However, this is not always
      * possible. For example, when the user is logged in anonymously using a web client.
@@ -271,19 +271,19 @@ public class Workgroup {
      * the queue, queue status events will be sent to indicate the user's position and
      * estimated time left in the queue. Once joining the queue, there are three ways
      * the user can leave the queue: <ul>
-     * <p/>
+     *
      * <li>The user is routed to an agent, which triggers a GroupChat invitation.
      * <li>The user asks to leave the queue by calling the {@link #departQueue} method.
      * <li>A server error occurs, or an administrator explicitly removes the user
      * from the queue.
      * </ul>
-     * <p/>
+     *
      * A user cannot request to join the queue again if already in the queue. Therefore,
      * this method will throw an IllegalStateException if the user is already in the queue.<p>
-     * <p/>
+     *
      * Some servers may be configured to require certain meta-data in order to
      * join the queue.<p>
-     * <p/>
+     *
      * The server tracks the conversations that a user has with agents over time. By
      * default, that tracking is done using the user's JID. However, this is not always
      * possible. For example, when the user is logged in anonymously using a web client.
@@ -310,19 +310,19 @@ public class Workgroup {
      * the queue, queue status events will be sent to indicate the user's position and
      * estimated time left in the queue. Once joining the queue, there are three ways
      * the user can leave the queue: <ul>
-     * <p/>
+     *
      * <li>The user is routed to an agent, which triggers a GroupChat invitation.
      * <li>The user asks to leave the queue by calling the {@link #departQueue} method.
      * <li>A server error occurs, or an administrator explicitly removes the user
      * from the queue.
      * </ul>
-     * <p/>
+     *
      * A user cannot request to join the queue again if already in the queue. Therefore,
      * this method will throw an IllegalStateException if the user is already in the queue.<p>
-     * <p/>
+     *
      * Some servers may be configured to require certain meta-data in order to
      * join the queue.<p>
-     * <p/>
+     *
      * The server tracks the conversations that a user has with agents over time. By
      * default, that tracking is done using the user's JID. However, this is not always
      * possible. For example, when the user is logged in anonymously using a web client.
@@ -359,19 +359,19 @@ public class Workgroup {
      * the queue, queue status events will be sent to indicate the user's position and
      * estimated time left in the queue. Once joining the queue, there are three ways
      * the user can leave the queue: <ul>
-     * <p/>
+     *
      * <li>The user is routed to an agent, which triggers a GroupChat invitation.
      * <li>The user asks to leave the queue by calling the {@link #departQueue} method.
      * <li>A server error occurs, or an administrator explicitly removes the user
      * from the queue.
      * </ul>
-     * <p/>
+     *
      * A user cannot request to join the queue again if already in the queue. Therefore,
      * this method will throw an IllegalStateException if the user is already in the queue.<p>
-     * <p/>
+     *
      * Some servers may be configured to require certain meta-data in order to
      * join the queue.<p>
-     * <p/>
+     *
      * The server tracks the conversations that a user has with agents over time. By
      * default, that tracking is done using the user's JID. However, this is not always
      * possible. For example, when the user is logged in anonymously using a web client.
@@ -413,7 +413,7 @@ public class Workgroup {
     /**
      * Departs the workgroup queue. If the user is not currently in the queue, this
      * method will do nothing.<p>
-     * <p/>
+     *
      * Normally, the user would not manually leave the queue. However, they may wish to
      * under certain circumstances -- for example, if they no longer wish to be routed
      * to an agent because they've been waiting too long.

smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java

@@ -84,7 +84,7 @@ public class MetaDataUtils {
     /**
      * Serializes a Map of String name/value pairs into the meta-data XML format.
      *
-     * @param metaData the Map of meta-data as Map<String,List<String>>
+     * @param metaData the Map of meta-data as Map<String,List<String>>
      * @return the meta-data values in XML form.
      */
     public static String serializeMetaData(Map<String, List<String>> metaData) {