diff options
Diffstat (limited to 'src/net/java/sip/communicator/service')
16 files changed, 161 insertions, 21 deletions
diff --git a/src/net/java/sip/communicator/service/protocol/AbstractCallPeer.java b/src/net/java/sip/communicator/service/protocol/AbstractCallPeer.java index a908733..3922e96 100644 --- a/src/net/java/sip/communicator/service/protocol/AbstractCallPeer.java +++ b/src/net/java/sip/communicator/service/protocol/AbstractCallPeer.java @@ -23,7 +23,6 @@ import java.util.*; import net.java.sip.communicator.service.protocol.event.*; import net.java.sip.communicator.util.*; -import org.jitsi.service.protocol.event.*; import org.jitsi.util.event.*; /** diff --git a/src/net/java/sip/communicator/service/protocol/CallPeer.java b/src/net/java/sip/communicator/service/protocol/CallPeer.java index 4204f5a..2fc5a30 100644 --- a/src/net/java/sip/communicator/service/protocol/CallPeer.java +++ b/src/net/java/sip/communicator/service/protocol/CallPeer.java @@ -23,8 +23,6 @@ import java.util.*; import net.java.sip.communicator.service.protocol.event.*; -import org.jitsi.service.protocol.event.*; - /** * The CallPeer is an interface that represents peers in a call. * Users of the UIService need to implement this interface (or one of its diff --git a/src/net/java/sip/communicator/service/protocol/OperationSetDTMF.java b/src/net/java/sip/communicator/service/protocol/OperationSetDTMF.java index 13c2827..cd7ff62 100644 --- a/src/net/java/sip/communicator/service/protocol/OperationSetDTMF.java +++ b/src/net/java/sip/communicator/service/protocol/OperationSetDTMF.java @@ -17,7 +17,7 @@ */ package net.java.sip.communicator.service.protocol; -import org.jitsi.service.protocol.*; +import org.jitsi.service.neomedia.*; /** * An <tt>OperationSet</tt> that allows other modules to send DMF tones through diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityListener.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityListener.java index 59d5ea7..e972d17 100644 --- a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityListener.java +++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityListener.java @@ -19,8 +19,6 @@ package net.java.sip.communicator.service.protocol.event; import java.util.*; -import org.jitsi.service.protocol.event.*; - /** * CallPeerSecurityListener interface extends EventListener. This is the * listener interface used to handle an event related with a change in security diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityMessageEvent.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityMessageEvent.java new file mode 100644 index 0000000..bcbb66a --- /dev/null +++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityMessageEvent.java @@ -0,0 +1,93 @@ +/* + * Jitsi, the OpenSource Java VoIP and Instant Messaging client. + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package net.java.sip.communicator.service.protocol.event; + +import java.util.*; + +/** + * The <tt>CallPeerSecurityFailedEvent</tt> is triggered whenever + * a problem has occurred during call security process. + * + * @author Yana Stamcheva + * @author Werner Dittmann + */ +public class CallPeerSecurityMessageEvent + extends EventObject +{ + /** + * Serial version UID. + */ + private static final long serialVersionUID = 0L; + + /** + * The internationalized message associated with this event. + */ + private final String eventI18nMessage; + + /** + * The message associated with this event. + */ + private final String eventMessage; + + /** + * The severity of the security message event. + */ + private final int eventSeverity; + + /** + * Creates a <tt>CallPeerSecurityFailedEvent</tt> by specifying the + * call peer, event type and message associated with this event. + * + * @param source the object on which the event initially occurred + * @param eventMessage the message associated with this event. + * @param i18nMessage the internationalized message associated with this + * event that could be shown to the user. + * @param eventSeverity severity level. + */ + public CallPeerSecurityMessageEvent( + Object source, + String eventMessage, + String i18nMessage, + int eventSeverity) + { + super(source); + + this.eventMessage = eventMessage; + this.eventI18nMessage = i18nMessage; + this.eventSeverity = eventSeverity; + } + + /** + * Returns the message associated with this event. + * + * @return the message associated with this event. + */ + public String getMessage() + { + return eventMessage; + } + + /** + * Returns the internationalized message associated with this event. + * + * @return the internationalized message associated with this event. + */ + public String getI18nMessage() + { + return eventI18nMessage; + } + + /** + * Returns the event severity. + * + * @return the eventSeverity + */ + public int getEventSeverity() + { + return eventSeverity; + } +} diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityNegotiationStartedEvent.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityNegotiationStartedEvent.java index 0462388..2bf7226 100644 --- a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityNegotiationStartedEvent.java +++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityNegotiationStartedEvent.java @@ -20,7 +20,6 @@ package net.java.sip.communicator.service.protocol.event; import net.java.sip.communicator.service.protocol.*; import org.jitsi.service.neomedia.*; -import org.jitsi.service.protocol.event.*; /** * The <tt>CallPeerSecurityNegotiationStartedEvent</tt> is triggered whenever a diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOffEvent.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOffEvent.java index 4fa7185..f49a3f4 100644 --- a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOffEvent.java +++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOffEvent.java @@ -19,8 +19,6 @@ package net.java.sip.communicator.service.protocol.event; import net.java.sip.communicator.service.protocol.*; -import org.jitsi.service.protocol.event.*; - /** * The <tt>CallPeerSecurityAuthenticationEvent</tt> is triggered whenever * a the security strings are received in a secure call. diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOnEvent.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOnEvent.java index 2293a74..45a803e 100644 --- a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOnEvent.java +++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOnEvent.java @@ -20,7 +20,6 @@ package net.java.sip.communicator.service.protocol.event; import net.java.sip.communicator.service.protocol.*; import org.jitsi.service.neomedia.*; -import org.jitsi.service.protocol.event.*; /** * The <tt>CallPeerSecurityOnEvent</tt> is triggered whenever a diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityStatusEvent.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityStatusEvent.java new file mode 100644 index 0000000..6720f4b --- /dev/null +++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityStatusEvent.java @@ -0,0 +1,64 @@ +/* + * Jitsi, the OpenSource Java VoIP and Instant Messaging client. + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package net.java.sip.communicator.service.protocol.event; + +import java.util.*; + +/** + * Parent class for SecurityOn and SecurityOff events. + * + * @author Yana Stamcheva + */ +public abstract class CallPeerSecurityStatusEvent + extends EventObject +{ + /** + * Serial version UID. + */ + private static final long serialVersionUID = 0L; + + /** + * Constant value defining that security is enabled. + */ + public static final int AUDIO_SESSION = 1; + + /** + * Constant value defining that security is disabled. + */ + public static final int VIDEO_SESSION = 2; + + /** + * Session type of the event {@link #AUDIO_SESSION} or + * {@link #VIDEO_SESSION}. + */ + private final int sessionType; + + /** + * Constructor required by the EventObject. + * + * @param source the source object for this event. + * @param sessionType either <code>AUDIO_SESSION</code> or + * <code>VIDEO_SESSION</code> to indicate the type of the + * session + */ + public CallPeerSecurityStatusEvent(Object source, int sessionType) + { + super(source); + + this.sessionType = sessionType; + } + + /** + * Returns the type of the session, either AUDIO_SESSION or VIDEO_SESSION. + * + * @return the type of the session, either AUDIO_SESSION or VIDEO_SESSION. + */ + public int getSessionType() + { + return sessionType; + } +} diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityTimeoutEvent.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityTimeoutEvent.java index b6cf784..55aa351 100644 --- a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityTimeoutEvent.java +++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityTimeoutEvent.java @@ -19,8 +19,6 @@ package net.java.sip.communicator.service.protocol.event; import net.java.sip.communicator.service.protocol.*; -import org.jitsi.service.protocol.event.*; - /** * The <tt>CallPeerSecurityTimeoutEvent</tt> is triggered whenever a * communication with a given peer cannot be established, the peer diff --git a/src/net/java/sip/communicator/service/protocol/event/DTMFReceivedEvent.java b/src/net/java/sip/communicator/service/protocol/event/DTMFReceivedEvent.java index 675f163..ce93487 100644 --- a/src/net/java/sip/communicator/service/protocol/event/DTMFReceivedEvent.java +++ b/src/net/java/sip/communicator/service/protocol/event/DTMFReceivedEvent.java @@ -19,7 +19,7 @@ package net.java.sip.communicator.service.protocol.event; import java.util.*; -import org.jitsi.service.protocol.*; +import org.jitsi.service.neomedia.*; /** * <tt>DTMFReceivedEvent</tt>s indicate reception of a DTMF tone. diff --git a/src/net/java/sip/communicator/service/protocol/media/AbstractQualityControlWrapper.java b/src/net/java/sip/communicator/service/protocol/media/AbstractQualityControlWrapper.java index da5adc4..9f070eb 100644 --- a/src/net/java/sip/communicator/service/protocol/media/AbstractQualityControlWrapper.java +++ b/src/net/java/sip/communicator/service/protocol/media/AbstractQualityControlWrapper.java @@ -18,7 +18,6 @@ package net.java.sip.communicator.service.protocol.media; import org.jitsi.service.neomedia.*; -import org.jitsi.service.protocol.*; /** * A wrapper of media quality control. @@ -153,8 +152,8 @@ public abstract class AbstractQualityControlWrapper< * with those settings. * * @param preset the desired video settings - * @throws OperationFailedException + * @throws MediaException */ public abstract void setPreferredRemoteSendMaxPreset(QualityPreset preset) - throws OperationFailedException; + throws MediaException; } 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 1c46000..4e15038 100644 --- a/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java +++ b/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java @@ -26,7 +26,6 @@ import net.java.sip.communicator.util.*; import org.jitsi.service.neomedia.*;
import org.jitsi.service.neomedia.event.*;
-import org.jitsi.service.protocol.event.*;
/**
* A utility class implementing media control code shared between current
diff --git a/src/net/java/sip/communicator/service/protocol/media/MediaHandler.java b/src/net/java/sip/communicator/service/protocol/media/MediaHandler.java index 1d5aa2f..7ceed29 100644 --- a/src/net/java/sip/communicator/service/protocol/media/MediaHandler.java +++ b/src/net/java/sip/communicator/service/protocol/media/MediaHandler.java @@ -32,7 +32,6 @@ import org.jitsi.service.neomedia.control.*; import org.jitsi.service.neomedia.device.*; import org.jitsi.service.neomedia.event.*; import org.jitsi.service.neomedia.format.*; -import org.jitsi.service.protocol.*; import org.jitsi.util.event.*; /** diff --git a/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf b/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf index aae71e1..4436e93 100644 --- a/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf +++ b/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf @@ -27,7 +27,6 @@ Import-Package: javax.xml.parsers, org.jitsi.service.neomedia.event, org.jitsi.service.neomedia.format, org.jitsi.service.neomedia.recording, - org.jitsi.service.protocol, org.jitsi.util, org.jitsi.util.event, org.jitsi.util.xml, diff --git a/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf b/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf index 20295af..271af97 100644 --- a/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf +++ b/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf @@ -12,7 +12,6 @@ Import-Package: net.java.sip.communicator.service.credentialsstorage, org.jitsi.service.neomedia, org.jitsi.service.neomedia.codec, org.jitsi.service.neomedia.recording, - org.jitsi.service.protocol.event, org.jitsi.service.resources, org.jitsi.util, org.jitsi.util.event, @@ -24,7 +23,6 @@ Export-Package: net.java.sip.communicator.service.protocol, net.java.sip.communicator.service.protocol.icqconstants, net.java.sip.communicator.service.protocol.jabber, net.java.sip.communicator.service.protocol.jabberconstants, - net.java.sip.communicator.service.protocol.msnconstants, net.java.sip.communicator.service.protocol.sip, net.java.sip.communicator.service.protocol.whiteboardobjects, net.java.sip.communicator.service.protocol.yahooconstants |