Renames occurrences of callParticipant to callPeer so that it would better reflect our new Call architecture that also includes conferencing and ConferenceMembers

cusax-fix
Emil Ivov 17 years ago
parent f406ddae3b
commit 756b2a847b

@ -530,7 +530,7 @@ public void run()
}
/**
* Waits for <tt>call</tt> to enter in the
* Waits for <tt>call</tt> to enter in the
* {@link #net.java.sip.communicator.protocol.CallState.CALL_ENDED}
* state.
*
@ -566,8 +566,8 @@ private void waitForCallEnd(Call call)
}
/**
* Goes through all participants in <tt>call</tt> and calls
* <tt>telephony.aswerCallParticipant()</tt> for every one of them.
* Goes through all peers in <tt>call</tt> and calls
* <tt>telephony.aswerCallPeer()</tt> for every one of them.
*
* @param call the <tt>Call</tt> that we'd like to answer.
*/
@ -577,21 +577,20 @@ private void answerCall(Call call)
= (OperationSetBasicTelephony)call
.getProtocolProvider().getOperationSet(
OperationSetBasicTelephony.class);
Iterator participants = call.getCallPeers();
Iterator peers = call.getCallPeers();
while(participants.hasNext())
while(peers.hasNext())
{
CallPeer participant
= (CallPeer)participants.next();
CallPeer peer = (CallPeer)peers.next();
try
{
telephony.answerCallPeer(participant);
telephony.answerCallPeer(peer);
}
catch (OperationFailedException exc)
{
logger.error("Could not answer to : "
+ participant
+ peer
+ " caused by the following exception: "
+ exc.getMessage(),
exc);
@ -600,8 +599,8 @@ private void answerCall(Call call)
}
/**
* Goes through all participants in <tt>call</tt> and calls
* <tt>telephony.hangupCallParticipant()</tt> for every one of them.
* Goes through all peers in <tt>call</tt> and calls
* <tt>telephony.hangupCallPeer()</tt> for every one of them.
*
* @param call the <tt>Call</tt> that we'd like to answer.
*/
@ -613,21 +612,20 @@ private void hangupCall(Call call)
OperationSetBasicTelephony.class);
logger.info("Max Message Length Reached, Mailbox is"
+" disconnecting the call");
Iterator callParticipants = call.getCallPeers();
Iterator<CallPeer> callPeers = call.getCallPeers();
while(callParticipants.hasNext())
while(callPeers.hasNext())
{
CallPeer participant
= (CallPeer)callParticipants.next();
CallPeer peer = callPeers.next();
try
{
telephony.hangupCallPeer(participant);
telephony.hangupCallPeer(peer);
}
catch (OperationFailedException exc)
{
logger.error("Could not Hang up on : "
+ participant
+ peer
+ " caused by the following exception: "
+ exc,
exc);

Loading…
Cancel
Save