aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java
diff options
context:
space:
mode:
authorLyubomir Marinov <lyubomir.marinov@jitsi.org>2013-12-05 22:47:46 +0200
committerLyubomir Marinov <lyubomir.marinov@jitsi.org>2013-12-05 22:47:46 +0200
commit9101e7e5b044e41a18534a64ae5fa7b4c1a21325 (patch)
treedcc1d4b2e1ab4730b60ffda7be055a6f8b812f86 /src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java
parent1ed3a5d62f53aa89aa699c63ef33486214168929 (diff)
downloadjitsi-9101e7e5b044e41a18534a64ae5fa7b4c1a21325.zip
jitsi-9101e7e5b044e41a18534a64ae5fa7b4c1a21325.tar.gz
jitsi-9101e7e5b044e41a18534a64ae5fa7b4c1a21325.tar.bz2
Fixes warnings.
Diffstat (limited to 'src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java')
-rw-r--r--src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java
index ec53bee..419ab4f 100644
--- a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java
+++ b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java
@@ -1009,7 +1009,7 @@ public abstract class AbstractOperationSetTelephonyConferencing<
* state of the conference in which this <tt>CallPeer</tt> participates.
*/
protected ConferenceInfoDocument getCurrentConferenceInfo(
- MediaAwareCallPeer callPeer)
+ MediaAwareCallPeer<?,?,?> callPeer)
{
ConferenceInfoDocument confInfo;
try
@@ -1109,7 +1109,7 @@ public abstract class AbstractOperationSetTelephonyConferencing<
* streams we have already set up with the other
* participants in the conference.
*/
- for (MediaAwareCallPeer otherCallPeer
+ for (MediaAwareCallPeer<?,?,?> otherCallPeer
: callPeer.getCall().getCallPeerList())
{
MediaStream otherStream