From 38777b05fbc00db277b7808eac26dc14ec9bb4bc Mon Sep 17 00:00:00 2001 From: Emil Ivov Date: Sun, 9 Aug 2009 21:34:45 +0000 Subject: [PATCH] Renames occurrences of callParticipant to callPeer so that it would better reflect our new Call architecture that also includes conferencing and ConferenceMembers --- .../protocol/sip/OperationSetDTMFSipImpl.java | 42 +++++++++---------- .../service/protocol/OperationSetDTMF.java | 12 +++--- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDTMFSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDTMFSipImpl.java index 82931672d..8cc0294e5 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDTMFSipImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDTMFSipImpl.java @@ -58,18 +58,18 @@ public OperationSetDTMFSipImpl(ProtocolProviderServiceSipImpl pps) * This is just a copy of the bye method from the OpSetBasicTelephony, * which was enhanced with a body in order to send the DTMF tone * - * @param callParticipant destination of the DTMF tone + * @param callPeer destination of the DTMF tone * @param dtmftone DTMF tone to send * @throws OperationFailedException */ - private void sayInfo(CallPeerSipImpl callParticipant, + private void sayInfo(CallPeerSipImpl callPeer, String dtmftone) throws OperationFailedException { Request info = null; try { - info = callParticipant.getDialog().createRequest(Request.INFO); + info = callPeer.getDialog().createRequest(Request.INFO); } catch (SipException ex) { @@ -103,7 +103,7 @@ private void sayInfo(CallPeerSipImpl callParticipant, ClientTransaction clientTransaction = null; try { - clientTransaction = callParticipant.getJainSipProvider() + clientTransaction = callPeer.getJainSipProvider() .getNewClientTransaction(info); } catch (TransactionUnavailableException ex) @@ -119,7 +119,7 @@ private void sayInfo(CallPeerSipImpl callParticipant, try { - if (callParticipant.getDialog().getState() + if (callPeer.getDialog().getState() == DialogState.TERMINATED) { //this is probably because the call has just ended, so don't @@ -129,7 +129,7 @@ private void sayInfo(CallPeerSipImpl callParticipant, return; } - callParticipant.getDialog().sendRequest(clientTransaction); + callPeer.getDialog().sendRequest(clientTransaction); logger.debug("sent request:\n" + info); } catch (SipException ex) @@ -143,7 +143,7 @@ private void sayInfo(CallPeerSipImpl callParticipant, /** * Does nothing - * + * * @param requestEvent the event request * @return true if the specified event has been handled by this * processor and shouldn't be offered to other processors registered @@ -161,7 +161,7 @@ public boolean processRequest(RequestEvent requestEvent) /** * Just look if the DTMF signal was well received, and log it - * + * * @param responseEvent the response event * @return true if the specified event has been handled by this * processor and shouldn't be offered to other processors registered @@ -195,7 +195,7 @@ public boolean processResponse(ResponseEvent responseEvent) /** * In case of timeout, just terminate the transaction - * + * * @param timeoutEvent the timeout event * @return true if the specified event has been handled by this * processor and shouldn't be offered to other processors registered @@ -210,7 +210,7 @@ public boolean processTimeout(TimeoutEvent timeoutEvent) /** * Just log the exception - * + * * @param exceptionEvent the event we have to handle * @return true if the specified event has been handled by this * processor and shouldn't be offered to other processors registered @@ -230,7 +230,7 @@ public boolean processIOException(IOExceptionEvent exceptionEvent) /** * Just log the end of the transaction - * + * * @param transactionTerminatedEvent the event we have to handle * @return true if the specified event has been handled by this * processor and shouldn't be offered to other processors registered @@ -246,7 +246,7 @@ public boolean processTransactionTerminated( /** * Just log the end of the dialog - * + * * @param dialogTerminatedEvent the event we have to handle * @return true if the specified event has been handled by this * processor and shouldn't be offered to other processors registered @@ -261,34 +261,34 @@ public boolean processDialogTerminated( } /** - * Sends the DTMFTone tone to callParticipant. + * Sends the DTMFTone tone to callPeer. * - * @param callParticipant the call participant to send tone to. - * @param tone the DTMF tone to send to callParticipant. + * @param callPeer the call peer to send tone to. + * @param tone the DTMF tone to send to callPeer. * * @throws OperationFailedException with code OPERATION_NOT_SUPPORTED if - * DTMF tones are not supported for callParticipant. + * DTMF tones are not supported for callPeer. * * @throws NullPointerException if one of the arguments is null. * - * @throws IllegalArgumentException in case the call participant does not + * @throws IllegalArgumentException in case the call peer does not * belong to the underlying implementation. */ - public void sendDTMF(CallPeer callParticipant, DTMFTone tone) + public void sendDTMF(CallPeer callPeer, DTMFTone tone) throws OperationFailedException, NullPointerException, IllegalArgumentException { - if (callParticipant == null || tone == null) + if (callPeer == null || tone == null) { throw new NullPointerException(); } - if (! (callParticipant instanceof CallPeerSipImpl)) + if (! (callPeer instanceof CallPeerSipImpl)) { throw new IllegalArgumentException(); } - CallPeerSipImpl cp = (CallPeerSipImpl) (callParticipant); + CallPeerSipImpl cp = (CallPeerSipImpl) (callPeer); this.sayInfo(cp, tone.getValue()); } } diff --git a/src/net/java/sip/communicator/service/protocol/OperationSetDTMF.java b/src/net/java/sip/communicator/service/protocol/OperationSetDTMF.java index ff5b062c5..90e7d2027 100644 --- a/src/net/java/sip/communicator/service/protocol/OperationSetDTMF.java +++ b/src/net/java/sip/communicator/service/protocol/OperationSetDTMF.java @@ -17,20 +17,20 @@ public interface OperationSetDTMF extends OperationSet { /** - * Sends the DTMFTone tone to callParticipant. + * Sends the DTMFTone tone to callPeer. * - * @param callParticipant the call participant to send tone to. - * @param tone the DTMF tone to send to callParticipant. + * @param callPeer the call peer to send tone to. + * @param tone the DTMF tone to send to callPeer. * * @throws OperationFailedException with code OPERATION_NOT_SUPPORTED if - * DTMF tones are not supported for callParticipant. + * DTMF tones are not supported for callPeer. * * @throws NullPointerException if one of the arguments is null. * - * @throws IllegalArgumentException in case the call participant does not + * @throws IllegalArgumentException in case the call peer does not * belong to the underlying implementation. */ - public void sendDTMF(CallPeer callParticipant, DTMFTone tone) + public void sendDTMF(CallPeer callPeer, DTMFTone tone) throws OperationFailedException, NullPointerException, ClassCastException;