vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-22 12:02:05 +01:00
Code Issues Releases Wiki Activity

Merge branch '4.2'

Browse source
This commit is contained in:
Florian Schmaus 2017-12-25 12:10:35 +01:00
commit 0cf33f9849
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -179,7 +179,7 @@ allprojects {
// work, we extra add '-quiet', which is added anyway by // work, we extra add '-quiet', which is added anyway by
// gradle. // gradle.
// TODO enable all doclints, see SMACK-650 // TODO enable all doclints, see SMACK-650
options.addStringOption('Xdoclint:all,-html,-syntax', '-quiet') options.addStringOption('Xdoclint:all,-html', '-quiet')
} }
} }
tasks.withType(Javadoc) { tasks.withType(Javadoc) {

2
smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
View file

@ -379,7 +379,7 @@ public interface XMPPConnection {
enum FromMode { enum FromMode {
/** /**
* Leave the 'from' attribute unchanged. This is the behavior of Smack < 4.0 * Leave the 'from' attribute unchanged. This is the behavior of Smack &lt; 4.0
*/ */
UNCHANGED, UNCHANGED,
/** /**

2
smack-core/src/main/java/org/jivesoftware/smack/initializer/VmArgInitializer.java
View file

@ -23,7 +23,7 @@ import org.jivesoftware.smack.provider.ProviderManager;
/** /**
* Looks for a provider file location based on the VM argument <i>smack.provider.file</>. If it is supplied, its value will * Looks for a provider file location based on the VM argument <i>smack.provider.file</i>. If it is supplied, its value will
* be used as a file location for a providers file and loaded into the {@link ProviderManager} on Smack initialization. * be used as a file location for a providers file and loaded into the {@link ProviderManager} on Smack initialization.
* *
* @author Robin Collier * @author Robin Collier

2
smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java
View file

@ -155,7 +155,7 @@ public final class Presence extends Stanza implements TypedCloneable<Presence> {
* {@link Mode#dnd do not disturb}. False will be returned when the type or mode * {@link Mode#dnd do not disturb}. False will be returned when the type or mode
* is any other value, including when the presence type is unavailable (offline). * is any other value, including when the presence type is unavailable (offline).
* This is a convenience method equivalent to * This is a convenience method equivalent to
* <tt>type == Type.available && (mode == Mode.away || mode == Mode.xa || mode == Mode.dnd)</tt>. * <tt>type == Type.available &amp;&amp; (mode == Mode.away || mode == Mode.xa || mode == Mode.dnd)</tt>.
* *
* @return true if the presence type is available and the presence mode is away, xa, or dnd. * @return true if the presence type is available and the presence mode is away, xa, or dnd.
*/ */

2
smack-core/src/main/java/org/jivesoftware/smack/provider/EmbeddedExtensionProvider.java
View file

@ -48,7 +48,7 @@ import org.xmlpull.v1.XmlPullParser;
* &lt;entry xmlns='http://www.w3.org/2005/Atom'&gt; * &lt;entry xmlns='http://www.w3.org/2005/Atom'&gt;
* &lt;title&gt;Soliloquy&lt;/title&gt; * &lt;title&gt;Soliloquy&lt;/title&gt;
* &lt;link rel='alternative' type='text/html'/&gt; * &lt;link rel='alternative' type='text/html'/&gt;
* &lt;id>tag:denmark.lit,2003:entry-32397&lt;/id&gt; * &lt;id&gt;tag:denmark.lit,2003:entry-32397&lt;/id&gt;
* &lt;/entry&gt; * &lt;/entry&gt;
* &lt;/item&gt; * &lt;/item&gt;
* &lt;/items&gt; * &lt;/items&gt;

4
smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java
View file

@ -55,7 +55,7 @@ import org.jxmpp.util.XmppStringUtils;
* &lt;iqProvider&gt; * &lt;iqProvider&gt;
* &lt;elementName&gt;query&lt;/elementName&gt; * &lt;elementName&gt;query&lt;/elementName&gt;
* &lt;namespace&gt;jabber:iq:time&lt;/namespace&gt; * &lt;namespace&gt;jabber:iq:time&lt;/namespace&gt;
* &lt;className&gt;org.jivesoftware.smack.packet.Time&lt/className&gt; * &lt;className&gt;org.jivesoftware.smack.packet.Time&lt;/className&gt;
* &lt;/iqProvider&gt; * &lt;/iqProvider&gt;
* &lt;/smackProviders&gt;</pre> * &lt;/smackProviders&gt;</pre>
* *
@ -91,7 +91,7 @@ import org.jxmpp.util.XmppStringUtils;
* &lt;extensionProvider&gt; * &lt;extensionProvider&gt;
* &lt;elementName&gt;x&lt;/elementName&gt; * &lt;elementName&gt;x&lt;/elementName&gt;
* &lt;namespace&gt;jabber:iq:event&lt;/namespace&gt; * &lt;namespace&gt;jabber:iq:event&lt;/namespace&gt;
* &lt;className&gt;org.jivesoftware.smack.packet.MessageEvent&lt/className&gt; * &lt;className&gt;org.jivesoftware.smack.packet.MessageEvent&lt;/className&gt;
* &lt;/extensionProvider&gt; * &lt;/extensionProvider&gt;
* &lt;/smackProviders&gt;</pre> * &lt;/smackProviders&gt;</pre>
* *