sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Applies a patch by Sébastien Mazy which fixes a type - replaces addSubsciptionListener with addSubscriptionListener.

Browse Source
cusax-fix
Lyubomir Marinov 17 years ago
parent e2ba282340
commit a874a33a1a
12 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File

4
src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
Unescape View File

@ -384,7 +384,7 @@ private void addNewContactToMetaContact( ProtocolProviderService provider,
addContactToEventIgnoreList(contactID, provider);
opSetPersPresence.addSubsciptionListener(evtRetriever);
opSetPersPresence.addSubscriptionListener(evtRetriever);
opSetPersPresence.addServerStoredGroupChangeListener(evtRetriever);
try
@ -1417,7 +1417,7 @@ private void synchronizeOpSetWithLocalContactList(
}
presenceOpSet
.addSubsciptionListener(clSubscriptionEventHandler);
.addSubscriptionListener(clSubscriptionEventHandler);
presenceOpSet
.addServerStoredGroupChangeListener(clGroupEventHandler);

2
src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatPanel.java
Unescape View File

@ -156,7 +156,7 @@ private void setupListeners(boolean add)
{
if (add)
{
opsPresence.addSubsciptionListener(this);
opsPresence.addSubscriptionListener(this);
}
else
{

2
src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetPersistentPresenceYahooImpl.java
Unescape View File

@ -831,7 +831,7 @@ public void registrationStateChanged(RegistrationStateChangeEvent evt)
initContactStatuses();
addSubsciptionListener(statusUpdater);
addSubscriptionListener(statusUpdater);
}
else if(evt.getNewState() == RegistrationState.UNREGISTERED
|| evt.getNewState() == RegistrationState.AUTHENTICATION_FAILED

2
src/net/java/sip/communicator/service/protocol/AbstractOperationSetPersistentPresence.java
Unescape View File

@ -47,7 +47,7 @@ protected AbstractOperationSetPersistentPresence(T parentProvider)
this.parentProvider = parentProvider;
}
public void addSubsciptionListener(SubscriptionListener listener)
public void addSubscriptionListener(SubscriptionListener listener)
{
synchronized (subscriptionListeners)
{

2
src/net/java/sip/communicator/service/protocol/OperationSetPresence.java
Unescape View File

@ -215,7 +215,7 @@ public void removeContactPresenceStatusListener(
* subscription was succesfully added, has failed or was removed.
* @param listener the SubscriptionListener to register
*/
public void addSubsciptionListener(SubscriptionListener listener);
public void addSubscriptionListener(SubscriptionListener listener);
/**
* Removes the specified subscription listener.

4
test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPresence.java
Unescape View File

@ -378,7 +378,7 @@ public void postTestSubscribe()
SubscriptionEventCollector subEvtCollector
= new SubscriptionEventCollector();
operationSetPresence1.addSubsciptionListener(subEvtCollector);
operationSetPresence1.addSubscriptionListener(subEvtCollector);
// second we will accept
authEventCollector2.responseToRequest =
@ -504,7 +504,7 @@ public void postTestUnsubscribe()
// First create a subscription and verify that it really gets created.
SubscriptionEventCollector subEvtCollector
= new SubscriptionEventCollector();
operationSetPresence1.addSubsciptionListener(subEvtCollector);
operationSetPresence1.addSubscriptionListener(subEvtCollector);
Contact gibberishTesterAgentContact = operationSetPresence1
.findContactByID(fixture.userID2);

4
test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPersistentPresence.java
Unescape View File

@ -196,7 +196,7 @@ public void postTestPersistentSubscribe()
//register a subscription event listener
SubscriptionEventCollector evtCollector
= new SubscriptionEventCollector();
opSetPersPresence.addSubsciptionListener(evtCollector);
opSetPersPresence.addSubscriptionListener(evtCollector);
//create the subscription and wait for a confirmation event.
opSetPersPresence.subscribe(group, "38687470");
@ -250,7 +250,7 @@ public void postTestPersistentUnsubscribe()
//register a subscription event listener
SubscriptionEventCollector evtCollector
= new SubscriptionEventCollector();
opSetPersPresence.addSubsciptionListener(evtCollector);
opSetPersPresence.addSubscriptionListener(evtCollector);
//remove the subscription and wait for a confirmation event.
opSetPersPresence.unsubscribe(contact);

8
test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPresence.java
Unescape View File

@ -460,7 +460,7 @@ public void postTestSubscribe()
// to the list as awaiting
SubscriptionEventCollector moveEvtCollector
= new SubscriptionEventCollector();
operationSetPresence.addSubsciptionListener(moveEvtCollector);
operationSetPresence.addSubscriptionListener(moveEvtCollector);
logger.debug("Waiting for authorization error and authorization response...");
authEventCollector.waitForAuthResponse(15000);
@ -509,7 +509,7 @@ public void postTestSubscribe()
UnsubscribeWait unsubscribeEvtCollector
= new UnsubscribeWait();
operationSetPresence.addSubsciptionListener(unsubscribeEvtCollector);
operationSetPresence.addSubscriptionListener(unsubscribeEvtCollector);
synchronized(unsubscribeEvtCollector){
operationSetPresence.unsubscribe(c);
@ -538,7 +538,7 @@ public void postTestSubscribe()
(operationSetPresence.findContactByID(fixture.testerAgent.getIcqUIN()) != null));
// add the listener beacuse now our authorization will be accepted
// and so the buddy will be finally added to the list
operationSetPresence.addSubsciptionListener(subEvtCollector);
operationSetPresence.addSubscriptionListener(subEvtCollector);
// subscribe again so we can trigger again the authorization procedure
operationSetPresence.subscribe(fixture.testerAgent.getIcqUIN());
@ -762,7 +762,7 @@ public void postTestUnsubscribe()
// First create a subscription and verify that it really gets created.
SubscriptionEventCollector subEvtCollector
= new SubscriptionEventCollector();
operationSetPresence.addSubsciptionListener(subEvtCollector);
operationSetPresence.addSubscriptionListener(subEvtCollector);
Contact icqTesterAgentContact = operationSetPresence
.findContactByID(fixture.testerAgent.getIcqUIN());

4
test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetPresence.java
Unescape View File

@ -467,7 +467,7 @@ public void postTestSubscribe()
SubscriptionEventCollector subEvtCollector
= new SubscriptionEventCollector();
operationSetPresence1.addSubsciptionListener(subEvtCollector);
operationSetPresence1.addSubscriptionListener(subEvtCollector);
// second we will accept
authEventCollector2.responseToRequest =
@ -609,7 +609,7 @@ public void postTestUnsubscribe()
// First create a subscription and verify that it really gets created.
SubscriptionEventCollector subEvtCollector
= new SubscriptionEventCollector();
operationSetPresence1.addSubsciptionListener(subEvtCollector);
operationSetPresence1.addSubscriptionListener(subEvtCollector);
Contact jabberTesterAgentContact = operationSetPresence1
.findContactByID(fixture.userID2);

8
test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPresence.java
Unescape View File

@ -451,7 +451,7 @@ public void postTestSubscribe()
SubscriptionEventCollector subEvtCollector
= new SubscriptionEventCollector();
operationSetPresence1.addSubsciptionListener(subEvtCollector);
operationSetPresence1.addSubscriptionListener(subEvtCollector);
synchronized (subEvtCollector){
@ -463,7 +463,7 @@ public void postTestSubscribe()
SubscriptionEventCollector subEvtCollector2
= new SubscriptionEventCollector();
operationSetPresence2.addSubsciptionListener(subEvtCollector2);
operationSetPresence2.addSubscriptionListener(subEvtCollector2);
synchronized (subEvtCollector2){
@ -551,7 +551,7 @@ public void postTestSubscribe()
{
// add the the user to the reverse side needed for status tests
subEvtCollector.collectedEvents.clear();
operationSetPresence2.addSubsciptionListener(subEvtCollector);
operationSetPresence2.addSubscriptionListener(subEvtCollector);
synchronized (subEvtCollector)
{
@ -592,7 +592,7 @@ public void postTestUnsubscribe()
// First create a subscription and verify that it really gets created.
SubscriptionEventCollector subEvtCollector
= new SubscriptionEventCollector();
operationSetPresence1.addSubsciptionListener(subEvtCollector);
operationSetPresence1.addSubscriptionListener(subEvtCollector);
Contact msnTesterAgentContact = operationSetPresence1
.findContactByID(fixture.userID2);

6
test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetPresence.java
Unescape View File

@ -363,7 +363,7 @@ public void postTestSubscribe()
SubscriptionEventCollector subEvtCollector
= new SubscriptionEventCollector();
this.operationSetPresence1.addSubsciptionListener(subEvtCollector);
this.operationSetPresence1.addSubscriptionListener(subEvtCollector);
synchronized (subEvtCollector){
@ -470,7 +470,7 @@ public void postTestSubscribe()
{
// add the the user to the reverse side needed for status tests
subEvtCollector.collectedEvents.clear();
this.operationSetPresence2.addSubsciptionListener(subEvtCollector);
this.operationSetPresence2.addSubscriptionListener(subEvtCollector);
synchronized (subEvtCollector)
{
@ -586,7 +586,7 @@ public void postTestUnsubscribe()
// First create a subscription and verify that it really gets created.
SubscriptionEventCollector subEvtCollector
= new SubscriptionEventCollector();
this.operationSetPresence1.addSubsciptionListener(subEvtCollector);
this.operationSetPresence1.addSubscriptionListener(subEvtCollector);
Contact sipTesterAgentContact = this.operationSetPresence1
.findContactByID(this.fixture.userID2);

8
test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java
Unescape View File

@ -351,7 +351,7 @@ public void postTestSubscribe()
SubscriptionEventCollector subEvtCollector
= new SubscriptionEventCollector();
operationSetPresence1.addSubsciptionListener(subEvtCollector);
operationSetPresence1.addSubscriptionListener(subEvtCollector);
synchronized (subEvtCollector){
@ -426,7 +426,7 @@ public void postTestSubscribe()
}
// add it
operationSetPresence1.addSubsciptionListener(subEvtCollector);
operationSetPresence1.addSubscriptionListener(subEvtCollector);
subEvtCollector.collectedEvents.clear();
synchronized (subEvtCollector){
operationSetPresence1.subscribe(fixture.userID2);
@ -489,7 +489,7 @@ public void postTestSubscribe()
{
// add the the user to the reverse side needed for status tests
subEvtCollector.collectedEvents.clear();
operationSetPresence2.addSubsciptionListener(subEvtCollector);
operationSetPresence2.addSubscriptionListener(subEvtCollector);
synchronized (subEvtCollector)
{
@ -522,7 +522,7 @@ public void postTestUnsubscribe()
// First create a subscription and verify that it really gets created.
SubscriptionEventCollector subEvtCollector
= new SubscriptionEventCollector();
operationSetPresence1.addSubsciptionListener(subEvtCollector);
operationSetPresence1.addSubscriptionListener(subEvtCollector);
Contact yahooTesterAgentContact = operationSetPresence1
.findContactByID(fixture.userID2);

Write Preview
Loading…
Cancel
Save