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

Small fixes to various comments. Adds logs when a SIP outgoing call is created and when a Conference-Info IQ is received.

Browse Source
cusax-fix
Boris Grozev 13 years ago
parent 387e4476b3
commit a3eb70a0b3
11 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File

4
src/net/java/sip/communicator/impl/gui/main/call/UIVideoHandler2.java
Unescape View File

@ -185,8 +185,8 @@ protected void localVideoStreamingPropertyChange(PropertyChangeEvent ev)
/**
* {@inheritDoc}
*
* Overrides {@link Observer#notifyObservers(Object)} to force the super to
* notify the added <tt>Observer</tt>s regardless of the <tt>changed</tt>
* Overrides {@link Observable#notifyObservers(Object)} to force the super
* to notify the added <tt>Observer</tt>s regardless of the <tt>changed</tt>
* state of this <tt>Observable</tt> which <tt>UIVideoHandler2</tt> does not
* use at the time of this writing.
*/

3
src/net/java/sip/communicator/impl/gui/main/call/conference/VideoConferenceCallPanel.java
Unescape View File

@ -583,6 +583,9 @@ else if (cmcParticipant == conferenceMember)
}
}
/**
* {@inheritDoc}
*/
protected ConferenceCallPeerRenderer updateViewFromModel(
ConferenceCallPeerRenderer callPeerPanel,
CallPeer callPeer)

8
src/net/java/sip/communicator/impl/protocol/jabber/AbstractCallJabberGTalkImpl.java
Unescape View File

@ -29,13 +29,7 @@ public abstract class AbstractCallJabberGTalkImpl
private boolean localInputEvtAware = false;
/**
* Initializes a new <tt>AbstractCallJabberGTalkImpl</tt> instance belonging
* to <tt>sourceProvider</tt> and associated with the jingle session with
* the specified <tt>jingleSID</tt> or <tt>sessionID</tt>. If the new
* instance corresponds to an incoming jingle or Google Talk session, then
* the jingleSID or sessionID would come from there. Otherwise, one could
* generate one using {@link JingleIQ#generateSID()} or {@link
* SessionIQ#generateSID()}.
* Initializes a new <tt>AbstractCallJabberGTalkImpl</tt> instance.
*
* @param parentOpSet the {@link OperationSetBasicTelephonyJabberImpl}
* instance in the context of which this call has been created.

12
src/net/java/sip/communicator/impl/protocol/jabber/CallJabberImpl.java
Unescape View File

@ -58,11 +58,7 @@ public class CallJabberImpl
colibriStreamConnectors;
/**
* Initializes a new <tt>CallJabberImpl</tt> instance belonging to
* <tt>sourceProvider</tt> and associated with the jingle session with the
* specified <tt>jingleSID</tt>. If the new instance corresponds to an
* incoming jingle session, then the jingleSID would come from there.
* Otherwise, one could generate one using {@link JingleIQ#generateSID()}.
* Initializes a new <tt>CallJabberImpl</tt> instance.
*
* @param parentOpSet the {@link OperationSetBasicTelephonyJabberImpl}
* instance in the context of which this call has been created.
@ -306,7 +302,7 @@ else if (!colibriID.equals(conferenceResponseID))
ColibriConferenceIQ.Content content
= colibri.getContent(contentName);
ColibriConferenceIQ.Channel localChannel = null;
if ((content != null) && (content.getChannelCount() > 0))
{
localChannel = content.getChannel(0);
@ -525,11 +521,11 @@ public void expireColibriChannels(
* <tt>PacketExtension</tt>s to be added to the <tt>session-initiate</tt>
* {@link JingleIQ} which is to init this <tt>CallJabberImpl</tt>
*
* @return the newly created <tt>Call</tt> corresponding to
* @return the newly created <tt>CallPeerJabberImpl</tt> corresponding to
* <tt>calleeJID</tt>. All following state change events will be
* delivered through this call peer.
*
* @throws OperationFailedException with the corresponding code if we fail
* @throws OperationFailedException with the corresponding code if we fail
* to create the call.
*/
public CallPeerJabberImpl initiateSession(

13
src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java
Unescape View File

@ -103,10 +103,10 @@ protected void notifyCallPeers(Call call)
}
/**
* Notifies all CallPeer associated with and established in a
* specific call has occurred
* Notifies a specific <tt>CallPeer</tt> about changes in the telephony
* conference-related information.
*
* @param callPeer the <tt>CallPeer</tt>
* @param callPeer the <tt>CallPeer</tt> to notify.
*/
private void notify(CallPeer callPeer)
{
@ -383,7 +383,7 @@ protected CallJabberImpl createOutgoingCall()
* Implements the protocol-dependent part of the logic of inviting a callee
* to a <tt>Call</tt>. The protocol-independent part of that logic is
* implemented by
* {@link AbstractOperationSetTelephonyConferencing#inviteCalleToCall(String,Call)}.
* {@link AbstractOperationSetTelephonyConferencing#inviteCalleeToCall(String,Call)}.
*/
protected CallPeer doInviteCalleeToCall(
String calleeAddress,
@ -480,7 +480,12 @@ public void processPacket(Packet packet)
sid);
if (callPeer != null)
{
if (logger.isDebugEnabled())
logger.debug("Processing COIN from" + coinIQ.getFrom()
+ "(version=" + coinIQ.getVersion() + ")");
handleCoin(callPeer, coinIQ);
}
}
}

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

@ -166,6 +166,8 @@ private synchronized CallSipImpl createOutgoingCall(
throws OperationFailedException
{
CallSipImpl call = createOutgoingCall();
if (logger.isInfoEnabled())
logger.info("Creating outgoing call to " + calleeAddress);
if (conference != null)
call.setConference(conference);

14
src/net/java/sip/communicator/service/protocol/Call.java
Unescape View File

@ -197,7 +197,8 @@ public ProtocolProviderService getProtocolProvider()
*
* @param sourceCallPeer the source <tt>CallPeer</tt> for the
* newly created event.
* @param eventID the ID of the event to create (see CPE member ints)
* @param eventID the ID of the event to create (see constants defined in
* <tt>CallPeerEvent</tt>)
*/
protected void fireCallPeerEvent(CallPeer sourceCallPeer, int eventID)
{
@ -433,9 +434,7 @@ public abstract void removeLocalUserSoundLevelListener(
/**
* Creates a new <tt>CallConference</tt> instance which is to represent the
* telephony conference-related state of this <tt>Call</tt>. If the method
* returns non-<tt>null</tt> reference, this <tt>Call</tt> will add itself
* to the returned reference via {@link CallConference#addCall(Call)}.
* telephony conference-related state of this <tt>Call</tt>.
* Allows extenders to override and customize the runtime type of the
* <tt>CallConference</tt> to used by this <tt>Call</tt>.
*
@ -480,9 +479,10 @@ public CallConference getConference()
/**
* Sets the telephony conference-related state of this <tt>Call</tt>. If the
* invocation modifies this instance, it notifies the registered
* <tt>CallChangeListeners</tt> with a
* {@link CallChangeEvent#CALL_CONFERENCE_CHANGE} event.
* invocation modifies this instance, it adds this <tt>Call</tt> to the
* newly set <tt>CallConference</tt> and fires a
* <tt>PropertyChangeEvent</tt> for the <tt>CONFERENCE</tt> property to its
* listeners.
*
* @param conference the <tt>CallConference</tt> instance to represent the
* telephony conference-related state of this <tt>Call</tt>

4
src/net/java/sip/communicator/service/protocol/CallConference.java
Unescape View File

@ -49,7 +49,7 @@ public class CallConference
* telephony conference-related state
* @return the number of <tt>CallPeer</tt>s associated with the
* <tt>Call</tt>s participating in the telephony conference-related state
* of the specified <tt>call</tt>
* of the specified <tt>Call</tt>
*/
public static int getCallPeerCount(Call call)
{
@ -199,7 +199,7 @@ protected void onCallPeerConferenceEvent(CallPeerConferenceEvent ev)
* The list of <tt>CallPeerConferenceListener</tt>s added to the
* <tt>CallPeer</tt>s associated with the <tt>CallPeer</tt>s participating
* in this telephony conference via
* {@link #addCallPeerConferenceListener</tt>}.
* {@link #addCallPeerConferenceListener}.
*/
private final List<CallPeerConferenceListener> callPeerConferenceListeners
= new LinkedList<CallPeerConferenceListener>();

17
src/net/java/sip/communicator/service/protocol/ProtocolNames.java
Unescape View File

@ -1,23 +1,23 @@
package net.java.sip.communicator.service.protocol;
/**
* Specifies the names of some of the most popular instant messageing protocols.
* Specifies the names of some of the most popular instant messaging protocols.
* These names should be used when registering an implementation of a protocol
* with the osgi framwke. These names must be set in the properties dictionary
* with the osgi framework. These names must be set in the properties dictionary
* that one specifies when registering an OSGI service. When setting one of
* these names a protocol implementor must map it against the
* these names, a protocol implementor must map it against the
* ProtocolProviderFactory.PROTOCOL_PROPERTY_NAME key.
* @author Emil Ivov
*/
public interface ProtocolNames
{
/**
* The SIP (and SIMPLE) protcools.
* The SIP (and SIMPLE) protocols.
*/
public static final String SIP = "SIP";
/**
* The Jabber protcool.
* The Jabber protocol.
*/
public static final String JABBER = "Jabber";
@ -52,21 +52,22 @@ public interface ProtocolNames
public static final String MSN = "MSN";
/**
* The Yahoo! messenger protcool.
* The Yahoo! messenger protocol.
*/
public static final String YAHOO = "Yahoo!";
/**
* The Skype protcool.
* The Skype protocol.
*/
public static final String SKYPE = "Skype";
/**
* The SIP Communicator MOCK protocol.
*/
public static final String SIP_COMMUNICATOR_MOCK = "sip-communicator-mock";
/**
* The Zeroconf protcool.
* The Zeroconf protocol.
*/
public static final String ZEROCONF = "Zeroconf";

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

@ -155,7 +155,7 @@ protected void addCallPeer(T callPeer)
* Removes <tt>callPeer</tt> from the list of peers in this call. The method
* has no effect if there was no such peer in the call.
*
* @param ev the event containing the <tt>CallPeer</tt> leaving the call and
* @param evt the event containing the <tt>CallPeer</tt> leaving the call and
* the reason (if any) for the <tt>CallPeerChangeEvent</tt>. Use the event
* as the cause for the call state change event.
*/

4
src/net/java/sip/communicator/service/protocol/media/MediaHandler.java
Unescape View File

@ -1327,11 +1327,11 @@ private void setLocalSSRC(MediaType mediaType, long localSSRC)
}
/**
* Sets the last-known local SSRC of the <tt>MediaStream</tt> of a specific
* Sets the last-known remote SSRC of the <tt>MediaStream</tt> of a specific
* <tt>MediaType</tt>.
*
* @param mediaType the <tt>MediaType</tt> of the <tt>MediaStream</tt> to
* set the last-known local SSRC of
* set the last-known remote SSRC of
* @param remoteSSRC the last-known remote SSRC of the <tt>MediaStream</tt>
* of the specified <tt>mediaType</tt>
*/

Write Preview
Loading…
Cancel
Save