diff --git a/src/net/java/sip/communicator/service/protocol/OperationSetTelephonyConferencing.java b/src/net/java/sip/communicator/service/protocol/OperationSetTelephonyConferencing.java
index d67733b8c..61a79345c 100644
--- a/src/net/java/sip/communicator/service/protocol/OperationSetTelephonyConferencing.java
+++ b/src/net/java/sip/communicator/service/protocol/OperationSetTelephonyConferencing.java
@@ -8,7 +8,7 @@
/**
* Provides operations necessary to create and handle conferencing calls.
- *
+ *
* @author Emil Ivov
*/
public interface OperationSetTelephonyConferencing
@@ -16,11 +16,11 @@ public interface OperationSetTelephonyConferencing
{
/**
* Creates a conference call with the specified callees as call
- * participants.
- *
+ * peers.
+ *
* @param callees
* the list of addresses that we should call
- * @return the newly created conference call containing all CallParticipants
+ * @return the newly created conference call containing all CallPeers
* @throws OperationNotSupportedException
* if the provider does not have any conferencing features.
*/
@@ -31,14 +31,14 @@ public Call createConfCall(String[] callees)
* Invites the callee represented by the specified uri to an already
* existing call. The difference between this method and createConfCall is
* that inviteCalleeToCall allows a user to transform an existing 1 to 1
- * call into a conference call, or add new participants to an already
+ * call into a conference call, or add new peers to an already
* established conference.
- *
+ *
* @param uri
* the callee to invite to an existing conf call.
* @param existingCall
* the call that we should invite the callee to.
- * @return the CallParticipant object corresponding to the callee
+ * @return the CallPeer object corresponding to the callee
* represented by the specified uri.
* @throws OperationNotSupportedException
* if allowing additional callees to a pre-established call is
diff --git a/src/net/java/sip/communicator/service/protocol/OperationSetVideoTelephony.java b/src/net/java/sip/communicator/service/protocol/OperationSetVideoTelephony.java
index e7975f6bf..2e7505577 100644
--- a/src/net/java/sip/communicator/service/protocol/OperationSetVideoTelephony.java
+++ b/src/net/java/sip/communicator/service/protocol/OperationSetVideoTelephony.java
@@ -16,7 +16,7 @@
* Represents an OperationSet giving access to video-specific
* functionality in telephony such as visual Components displaying
* video and listening to dynamic availability of such Components.
- *
+ *
* @author Lubomir Marinov
*/
public interface OperationSetVideoTelephony
@@ -26,24 +26,23 @@ public interface OperationSetVideoTelephony
/**
* Adds a specific VideoListener to this telephony in order to
* receive notifications when visual/video Components are being
- * added and removed for a specific CallParticipant.
- *
- * @param participant the CallParticipant whose video the
+ * added and removed for a specific CallPeer.
+ *
+ * @param peer the CallPeer whose video the
* specified listener is to be notified about
* @param listener the VideoListener to be notified when
* visual/video Components are being added or
- * removed for participant
+ * removed for peer
*/
- public void addVideoListener(
- CallPeer participant, VideoListener listener);
+ public void addVideoListener( CallPeer peer, VideoListener listener);
/**
* Creates a visual Component which depicts the local video
- * being streamed to a specific CallParticipant. The returned
+ * being streamed to a specific CallPeer. The returned
* visual Component should be disposed when it is no longer
* required through {@link #disposeLocalVisualComponent(CallPeer, Component) disposeLocalVisualComponent}.
*
- * @param participant the CallParticipant to whom the local
+ * @param peer the CallPeer to whom the local
* video which is to be depicted by the returned visual
* Component is being streamed
* @param listener if not null, a VideoListener to
@@ -52,56 +51,56 @@ public void addVideoListener(
* created visual Component immediately/as the
* result of this method call
* @return a visual Component which depicts the local video
- * being streamed to the specified CallParticipant if
+ * being streamed to the specified CallPeer if
* this telephony chooses to carry out the creation synchronously;
* null if this telephony chooses to create the requested
* visual Component asynchronously.
*/
public Component createLocalVisualComponent(
- CallPeer participant, VideoListener listener)
+ CallPeer peer, VideoListener listener)
throws OperationFailedException;
/**
* Disposes of a visual Component depicting the local video for
- * a specific CallParticipant (previously obtained through
- * {@link createLocalVisualComponent(CallParticipant, VideoListener) createLocalVisualComponent}).
+ * a specific CallPeer (previously obtained through
+ * {@link createLocalVisualComponent(CallPeer, VideoListener) createLocalVisualComponent}).
* The disposal may include, but is not limited to, releasing the
* Player which provides the component and renders
* the local video into it, disconnecting from the video capture device.
*
- * @param participant the CallParticipant for whom the visual
+ * @param peer the CallPeer for whom the visual
* Component depicts the local video
* @param component the visual Component depicting the local
* video to be disposed
*/
public void disposeLocalVisualComponent(
- CallPeer participant, Component component);
+ CallPeer peer, Component component);
/**
* Gets the visual/video Components available in this telephony
- * for a specific CallParticipant.
- *
- * @param participant the CallParticipant whose videos are to
+ * for a specific CallPeer.
+ *
+ * @param peer the CallPeer whose videos are to
* be retrieved
* @return an array of the visual Components available in this
- * telephony for the specified participant
+ * telephony for the specified peer
*/
- public Component[] getVisualComponents(CallPeer participant);
+ public Component[] getVisualComponents(CallPeer peer);
/**
* Removes a specific VideoListener from this telephony in
* order to no longer have it receive notifications when visual/video
* Components are being added and removed for a specific
- * CallParticipant.
- *
- * @param participant the CallParticipant whose video the
+ * CallPeer.
+ *
+ * @param peer the CallPeer whose video the
* specified listener is to no longer be notified about
* @param listener the VideoListener to no longer be notified
* when visual/video Components are being added or
- * removed for participant
+ * removed for peer
*/
public void removeVideoListener(
- CallPeer participant, VideoListener listener);
+ CallPeer peer, VideoListener listener);
/**
* Sets the indicator which determines whether the streaming of local video