From 0f09a0cc4e6f29d238ee4ed4dea31e13b688ec99 Mon Sep 17 00:00:00 2001 From: Ingo Bauersachs Date: Tue, 4 Oct 2011 12:22:16 +0000 Subject: [PATCH] Rename generic srtp classes from Zrtp* to Srtp* --- .../impl/neomedia/MediaServiceImpl.java | 4 ++-- .../impl/neomedia/MediaStreamImpl.java | 2 +- .../impl/neomedia/ZrtpControlImpl.java | 8 ++++---- .../transform/zrtp/SecurityEventManager.java | 4 ++-- .../jabber/CallPeerMediaHandlerJabberImpl.java | 6 +++--- .../sip/CallPeerMediaHandlerSipImpl.java | 2 +- .../service/neomedia/MediaService.java | 4 ++-- .../service/neomedia/MediaStream.java | 2 +- .../{ZrtpControl.java => SrtpControl.java} | 6 +++--- .../{ZrtpListener.java => SrtpListener.java} | 2 +- .../protocol/media/CallPeerMediaHandler.java | 16 ++++++++-------- .../protocol/media/MediaAwareCallPeer.java | 2 +- ...AwareCallPeer.java => SrtpAwareCallPeer.java} | 4 ++-- 13 files changed, 31 insertions(+), 31 deletions(-) rename src/net/java/sip/communicator/service/neomedia/{ZrtpControl.java => SrtpControl.java} (94%) rename src/net/java/sip/communicator/service/neomedia/event/{ZrtpListener.java => SrtpListener.java} (98%) rename src/net/java/sip/communicator/service/protocol/media/{ZrtpAwareCallPeer.java => SrtpAwareCallPeer.java} (89%) diff --git a/src/net/java/sip/communicator/impl/neomedia/MediaServiceImpl.java b/src/net/java/sip/communicator/impl/neomedia/MediaServiceImpl.java index 3f85d06fd..c08844238 100644 --- a/src/net/java/sip/communicator/impl/neomedia/MediaServiceImpl.java +++ b/src/net/java/sip/communicator/impl/neomedia/MediaServiceImpl.java @@ -202,7 +202,7 @@ public MediaStream createMediaStream( public MediaStream createMediaStream( StreamConnector connector, MediaDevice device, - ZrtpControl zrtpControl) + SrtpControl zrtpControl) { switch (device.getMediaType()) { @@ -569,7 +569,7 @@ void stop() * * @return ZrtpControl instance. */ - public ZrtpControl createZrtpControl() + public SrtpControl createZrtpControl() { return new ZrtpControlImpl(); } diff --git a/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java b/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java index 8f51a764a..429b3dfdc 100644 --- a/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java +++ b/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java @@ -1099,7 +1099,7 @@ private RTPManager getRTPManager() * * @return the ZrtpControl which controls the ZRTP of this stream */ - public ZrtpControl getZrtpControl() + public SrtpControl getZrtpControl() { return zrtpControl; } diff --git a/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java b/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java index a25e24720..ff520986e 100644 --- a/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java +++ b/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java @@ -20,12 +20,12 @@ * @author Damian Minkov */ public class ZrtpControlImpl - implements ZrtpControl + implements SrtpControl { /** * The listener interested in security events about zrtp. */ - private ZrtpListener zrtpListener = null; + private SrtpListener zrtpListener = null; /** * Additional info codes for and data to support ZRTP4J. @@ -78,7 +78,7 @@ public void cleanup() * * @param zrtpListener the ZrtpListener to set */ - public void setZrtpListener(ZrtpListener zrtpListener) + public void setZrtpListener(SrtpListener zrtpListener) { this.zrtpListener = zrtpListener; } @@ -88,7 +88,7 @@ public void setZrtpListener(ZrtpListener zrtpListener) * * @return the ZrtpListener which listens for security events */ - public ZrtpListener getZrtpListener() + public SrtpListener getSrtpListener() { return this.zrtpListener; } diff --git a/src/net/java/sip/communicator/impl/neomedia/transform/zrtp/SecurityEventManager.java b/src/net/java/sip/communicator/impl/neomedia/transform/zrtp/SecurityEventManager.java index bdb9cedd9..db332e133 100644 --- a/src/net/java/sip/communicator/impl/neomedia/transform/zrtp/SecurityEventManager.java +++ b/src/net/java/sip/communicator/impl/neomedia/transform/zrtp/SecurityEventManager.java @@ -71,7 +71,7 @@ public class SecurityEventManager extends ZrtpUserCallback /** * A callback to the instance that created us. */ - private final ZrtpListener securityListener; + private final SrtpListener securityListener; /** * Is this a ZRTP DH (Master) session? @@ -106,7 +106,7 @@ public class SecurityEventManager extends ZrtpUserCallback public SecurityEventManager(ZrtpControlImpl zrtpControl) { this.zrtpControl = zrtpControl; - this.securityListener = zrtpControl.getZrtpListener(); + this.securityListener = zrtpControl.getSrtpListener(); } /** diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java index 3e4e227ac..523d3db1e 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java @@ -343,7 +343,7 @@ public void processOffer(List offer) // ZRTP if(getPeer().getCall().isSipZrtpAttribute()) { - ZrtpControl control = getZrtpControls().get(mediaType); + SrtpControl control = getZrtpControls().get(mediaType); if(control == null) { control = JabberActivator.getMediaService() @@ -550,7 +550,7 @@ private ContentPacketExtension createContent(MediaDevice dev) //ZRTP if(getPeer().getCall().isSipZrtpAttribute()) { - ZrtpControl control = getZrtpControls().get(dev.getMediaType()); + SrtpControl control = getZrtpControls().get(dev.getMediaType()); if(control == null) { @@ -689,7 +689,7 @@ public List createContentList() //ZRTP if(getPeer().getCall().isSipZrtpAttribute()) { - ZrtpControl control = getZrtpControls().get(mediaType); + SrtpControl control = getZrtpControls().get(mediaType); if(control == null) { control = JabberActivator.getMediaService() diff --git a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandlerSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandlerSipImpl.java index c9d4d50c2..f43338012 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandlerSipImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandlerSipImpl.java @@ -559,7 +559,7 @@ private void updateMediaDescriptionForZrtp( { try { - ZrtpControl control + SrtpControl control = getZrtpControls().get(mediaType); if(control == null) { diff --git a/src/net/java/sip/communicator/service/neomedia/MediaService.java b/src/net/java/sip/communicator/service/neomedia/MediaService.java index 1a7c7bb0f..b910af0c7 100644 --- a/src/net/java/sip/communicator/service/neomedia/MediaService.java +++ b/src/net/java/sip/communicator/service/neomedia/MediaService.java @@ -99,7 +99,7 @@ public MediaStream createMediaStream(StreamConnector connector, */ public MediaStream createMediaStream(StreamConnector connector, MediaDevice device, - ZrtpControl zrtpControl); + SrtpControl zrtpControl); /** * Creates a new MediaDevice which uses a specific @@ -135,7 +135,7 @@ public MediaStream createMediaStream(StreamConnector connector, * * @return ZrtpControl instance. */ - public ZrtpControl createZrtpControl(); + public SrtpControl createZrtpControl(); /** * Returns the control that handles current playback levels. diff --git a/src/net/java/sip/communicator/service/neomedia/MediaStream.java b/src/net/java/sip/communicator/service/neomedia/MediaStream.java index b367a993e..2487a71d6 100644 --- a/src/net/java/sip/communicator/service/neomedia/MediaStream.java +++ b/src/net/java/sip/communicator/service/neomedia/MediaStream.java @@ -319,5 +319,5 @@ public void addDynamicRTPPayloadType( * * @return the ZrtpControl which controls the ZRTP for this stream */ - public ZrtpControl getZrtpControl(); + public SrtpControl getZrtpControl(); } diff --git a/src/net/java/sip/communicator/service/neomedia/ZrtpControl.java b/src/net/java/sip/communicator/service/neomedia/SrtpControl.java similarity index 94% rename from src/net/java/sip/communicator/service/neomedia/ZrtpControl.java rename to src/net/java/sip/communicator/service/neomedia/SrtpControl.java index be31e0364..7b13c3f11 100644 --- a/src/net/java/sip/communicator/service/neomedia/ZrtpControl.java +++ b/src/net/java/sip/communicator/service/neomedia/SrtpControl.java @@ -13,7 +13,7 @@ * * @author Damian Minkov */ -public interface ZrtpControl +public interface SrtpControl { /** * Cleans up the current zrtp control and its engine. @@ -26,14 +26,14 @@ public interface ZrtpControl * * @param zrtpListener the ZrtpListener to set */ - public void setZrtpListener(ZrtpListener zrtpListener); + public void setZrtpListener(SrtpListener zrtpListener); /** * Returns the ZrtpListener which listens for security events. * * @return the ZrtpListener which listens for security events */ - public ZrtpListener getZrtpListener(); + public SrtpListener getSrtpListener(); /** * Gets the default secure/unsecure communication status for the supported diff --git a/src/net/java/sip/communicator/service/neomedia/event/ZrtpListener.java b/src/net/java/sip/communicator/service/neomedia/event/SrtpListener.java similarity index 98% rename from src/net/java/sip/communicator/service/neomedia/event/ZrtpListener.java rename to src/net/java/sip/communicator/service/neomedia/event/SrtpListener.java index cf457c66b..a45534397 100644 --- a/src/net/java/sip/communicator/service/neomedia/event/ZrtpListener.java +++ b/src/net/java/sip/communicator/service/neomedia/event/SrtpListener.java @@ -13,7 +13,7 @@ * * @author Yana Stamcheva */ -public interface ZrtpListener +public interface SrtpListener { /** * Indicates that the security has been turned on. When we are in the case diff --git a/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java b/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java index 5142f3687..c1c788792 100644 --- a/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java +++ b/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java @@ -97,7 +97,7 @@ public abstract class CallPeerMediaHandler< * A reference to the object that would be responsible for ZRTP control * and which most often would be the peer itself. */ - public final ZrtpListener zrtpController; + public final SrtpListener zrtpController; /** * The RTP stream that this media handler uses to send audio. @@ -193,8 +193,8 @@ public abstract class CallPeerMediaHandler< /** * Holds the ZRTP controls used for the current call. */ - private Map zrtpControls = - new Hashtable(); + private Map zrtpControls = + new Hashtable(); /** * The KeyFrameControl currently known to this @@ -334,7 +334,7 @@ public void videoUpdate( * controlling zrtp, and which most often would be the peer itself. */ public CallPeerMediaHandler(T peer, - ZrtpListener zrtpController) + SrtpListener zrtpController) { this.peer = peer; this.zrtpController = zrtpController; @@ -423,7 +423,7 @@ protected void closeStream(MediaType type) getTransportManager().closeStreamConnector(type); // Clear the ZRTP controls used for the associated Call. - ZrtpControl zrtpCtrl = zrtpControls.get(type); + SrtpControl zrtpCtrl = zrtpControls.get(type); if (zrtpCtrl != null) { @@ -1161,7 +1161,7 @@ public void setCsrcAudioLevelListener( * * @return the currently valid ZrtpControls map. */ - protected Map getZrtpControls() + protected Map getZrtpControls() { return this.zrtpControls; } @@ -1206,7 +1206,7 @@ protected MediaStream initStream(StreamConnector connector, logger.trace("The media types of device and format differ."); // check whether a control already exists - ZrtpControl control = zrtpControls.get(mediaType); + SrtpControl control = zrtpControls.get(mediaType); MediaService mediaService = ProtocolMediaActivator.getMediaService(); @@ -1282,7 +1282,7 @@ protected MediaStream configureStream( MediaDevice device, { // we use the audio stream for master stream // when using ZRTP multistreams. - ZrtpControl zrtpControl = stream.getZrtpControl(); + SrtpControl zrtpControl = stream.getZrtpControl(); zrtpControl.setZrtpListener(zrtpController); zrtpControl.start(stream instanceof AudioMediaStream); diff --git a/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java b/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java index 23f43be39..9f7b9c046 100644 --- a/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java +++ b/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java @@ -36,7 +36,7 @@ public abstract class MediaAwareCallPeer U extends CallPeerMediaHandler, V extends ProtocolProviderService> extends AbstractCallPeer - implements ZrtpListener, + implements SrtpListener, CallPeerConferenceListener, CsrcAudioLevelListener, SimpleAudioLevelListener diff --git a/src/net/java/sip/communicator/service/protocol/media/ZrtpAwareCallPeer.java b/src/net/java/sip/communicator/service/protocol/media/SrtpAwareCallPeer.java similarity index 89% rename from src/net/java/sip/communicator/service/protocol/media/ZrtpAwareCallPeer.java rename to src/net/java/sip/communicator/service/protocol/media/SrtpAwareCallPeer.java index 71f57dd9c..284bc925c 100644 --- a/src/net/java/sip/communicator/service/protocol/media/ZrtpAwareCallPeer.java +++ b/src/net/java/sip/communicator/service/protocol/media/SrtpAwareCallPeer.java @@ -18,10 +18,10 @@ * * @author Emil Ivov */ -public abstract class ZrtpAwareCallPeer extends AbstractCallPeer - implements ZrtpControl + implements SrtpControl { }