Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-29 09:42:06 +01:00
Code Issues Releases Wiki Activity

Fix typo: s/no_acceptable/not_acceptable

Browse source 
in XMPPError.Condition
This commit is contained in:
Florian Schmaus 2014-07-12 12:39:04 +02:00
parent fc39ac88bd
commit cde6dd65b3
8 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
View file

@ -38,7 +38,7 @@ import java.util.Map;
* <tr><td>feature-not-implemented</td><td>CANCEL</td></tr> * <tr><td>feature-not-implemented</td><td>CANCEL</td></tr>
* <tr><td>gone</td><td>MODIFY</td></tr> * <tr><td>gone</td><td>MODIFY</td></tr>
* <tr><td>jid-malformed</td><td>MODIFY</td></tr> * <tr><td>jid-malformed</td><td>MODIFY</td></tr>
* <tr><td>no-acceptable</td><td> MODIFY</td></tr> * <tr><td>not-acceptable</td><td> MODIFY</td></tr>
* <tr><td>not-allowed</td><td>CANCEL</td></tr> * <tr><td>not-allowed</td><td>CANCEL</td></tr>
* <tr><td>not-authorized</td><td>AUTH</td></tr> * <tr><td>not-authorized</td><td>AUTH</td></tr>
* <tr><td>payment-required</td><td>AUTH</td></tr> * <tr><td>payment-required</td><td>AUTH</td></tr>
@ -276,7 +276,7 @@ public class XMPPError {
public static final Condition gone = new Condition("gone"); public static final Condition gone = new Condition("gone");
public static final Condition item_not_found = new Condition("item-not-found"); public static final Condition item_not_found = new Condition("item-not-found");
public static final Condition jid_malformed = new Condition("jid-malformed"); public static final Condition jid_malformed = new Condition("jid-malformed");
public static final Condition no_acceptable = new Condition("not-acceptable"); public static final Condition not_acceptable = new Condition("not-acceptable");
public static final Condition not_allowed = new Condition("not-allowed"); public static final Condition not_allowed = new Condition("not-allowed");
public static final Condition not_authorized = new Condition("not-authorized"); public static final Condition not_authorized = new Condition("not-authorized");
public static final Condition payment_required = new Condition("payment-required"); public static final Condition payment_required = new Condition("payment-required");
@ -348,8 +348,8 @@ public class XMPPError {
Condition.gone, Type.MODIFY)); Condition.gone, Type.MODIFY));
instances.put(Condition.jid_malformed, new XMPPError.ErrorSpecification( instances.put(Condition.jid_malformed, new XMPPError.ErrorSpecification(
Condition.jid_malformed, Type.MODIFY)); Condition.jid_malformed, Type.MODIFY));
instances.put(Condition.no_acceptable, new XMPPError.ErrorSpecification( instances.put(Condition.not_acceptable, new XMPPError.ErrorSpecification(
Condition.no_acceptable, Type.MODIFY)); Condition.not_acceptable, Type.MODIFY));
instances.put(Condition.not_allowed, new XMPPError.ErrorSpecification( instances.put(Condition.not_allowed, new XMPPError.ErrorSpecification(
Condition.not_allowed, Type.CANCEL)); Condition.not_allowed, Type.CANCEL));
instances.put(Condition.not_authorized, new XMPPError.ErrorSpecification( instances.put(Condition.not_authorized, new XMPPError.ErrorSpecification(

2
smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
View file

@ -451,7 +451,7 @@ public class InBandBytestreamManager implements BytestreamManager {
* @throws NotConnectedException * @throws NotConnectedException
*/ */
protected void replyRejectPacket(IQ request) throws NotConnectedException { protected void replyRejectPacket(IQ request) throws NotConnectedException {
XMPPError xmppError = new XMPPError(XMPPError.Condition.no_acceptable); XMPPError xmppError = new XMPPError(XMPPError.Condition.not_acceptable);
IQ error = IQ.createErrorResponse(request, xmppError); IQ error = IQ.createErrorResponse(request, xmppError);
this.connection.sendPacket(error); this.connection.sendPacket(error);
} }

2
smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
View file

@ -708,7 +708,7 @@ public final class Socks5BytestreamManager implements BytestreamManager {
* @throws NotConnectedException * @throws NotConnectedException
*/ */
protected void replyRejectPacket(IQ packet) throws NotConnectedException { protected void replyRejectPacket(IQ packet) throws NotConnectedException {
XMPPError xmppError = new XMPPError(XMPPError.Condition.no_acceptable); XMPPError xmppError = new XMPPError(XMPPError.Condition.not_acceptable);
IQ errorIQ = IQ.createErrorResponse(packet, xmppError); IQ errorIQ = IQ.createErrorResponse(packet, xmppError);
this.connection.sendPacket(errorIQ); this.connection.sendPacket(errorIQ);
} }

2
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
View file

@ -174,7 +174,7 @@ public class FileTransferManager {
IQ rejection = FileTransferNegotiator.createIQ( IQ rejection = FileTransferNegotiator.createIQ(
initiation.getPacketID(), initiation.getFrom(), initiation initiation.getPacketID(), initiation.getFrom(), initiation
.getTo(), IQ.Type.ERROR); .getTo(), IQ.Type.ERROR);
rejection.setError(new XMPPError(XMPPError.Condition.no_acceptable)); rejection.setError(new XMPPError(XMPPError.Condition.not_acceptable));
connection.sendPacket(rejection); connection.sendPacket(rejection);
} }
} }

2
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
View file

@ -84,7 +84,7 @@ public class InBandBytestreamRequestTest {
// assert that reply is the correct error packet // assert that reply is the correct error packet
assertEquals(initiatorJID, argument.getValue().getTo()); assertEquals(initiatorJID, argument.getValue().getTo());
assertEquals(IQ.Type.ERROR, argument.getValue().getType()); assertEquals(IQ.Type.ERROR, argument.getValue().getType());
assertEquals(XMPPError.Condition.no_acceptable.toString(), assertEquals(XMPPError.Condition.not_acceptable.toString(),
argument.getValue().getError().getCondition()); argument.getValue().getError().getCondition());
} }

4
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
View file

@ -92,7 +92,7 @@ public class InitiationListenerTest {
// assert that reply is the correct error packet // assert that reply is the correct error packet
assertEquals(initiatorJID, argument.getValue().getTo()); assertEquals(initiatorJID, argument.getValue().getTo());
assertEquals(IQ.Type.ERROR, argument.getValue().getType()); assertEquals(IQ.Type.ERROR, argument.getValue().getType());
assertEquals(XMPPError.Condition.no_acceptable.toString(), assertEquals(XMPPError.Condition.not_acceptable.toString(),
argument.getValue().getError().getCondition()); argument.getValue().getError().getCondition());
} }
@ -210,7 +210,7 @@ public class InitiationListenerTest {
// assert that reply is the correct error packet // assert that reply is the correct error packet
assertEquals(initiatorJID, argument.getValue().getTo()); assertEquals(initiatorJID, argument.getValue().getTo());
assertEquals(IQ.Type.ERROR, argument.getValue().getType()); assertEquals(IQ.Type.ERROR, argument.getValue().getType());
assertEquals(XMPPError.Condition.no_acceptable.toString(), assertEquals(XMPPError.Condition.not_acceptable.toString(),
argument.getValue().getError().getCondition()); argument.getValue().getError().getCondition());
} }

4
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
View file

@ -99,7 +99,7 @@ public class InitiationListenerTest {
// assert that reply is the correct error packet // assert that reply is the correct error packet
assertEquals(initiatorJID, argument.getValue().getTo()); assertEquals(initiatorJID, argument.getValue().getTo());
assertEquals(IQ.Type.ERROR, argument.getValue().getType()); assertEquals(IQ.Type.ERROR, argument.getValue().getType());
assertEquals(XMPPError.Condition.no_acceptable.toString(), assertEquals(XMPPError.Condition.not_acceptable.toString(),
argument.getValue().getError().getCondition()); argument.getValue().getError().getCondition());
} }
@ -189,7 +189,7 @@ public class InitiationListenerTest {
// assert that reply is the correct error packet // assert that reply is the correct error packet
assertEquals(initiatorJID, argument.getValue().getTo()); assertEquals(initiatorJID, argument.getValue().getTo());
assertEquals(IQ.Type.ERROR, argument.getValue().getType()); assertEquals(IQ.Type.ERROR, argument.getValue().getType());
assertEquals(XMPPError.Condition.no_acceptable.toString(), assertEquals(XMPPError.Condition.not_acceptable.toString(),
argument.getValue().getError().getCondition()); argument.getValue().getError().getCondition());
} }

2
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
View file

@ -424,7 +424,7 @@ public class Socks5ByteStreamManagerTest {
Verification.requestTypeGET); Verification.requestTypeGET);
// build error packet to reject SOCKS5 Bytestream // build error packet to reject SOCKS5 Bytestream
XMPPError xmppError = new XMPPError(XMPPError.Condition.no_acceptable); XMPPError xmppError = new XMPPError(XMPPError.Condition.not_acceptable);
IQ rejectPacket = new IQ() { IQ rejectPacket = new IQ() {
public String getChildElementXML() { public String getChildElementXML() {