diff options
| author | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2012-07-10 08:15:25 +0000 |
|---|---|---|
| committer | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2012-07-10 08:15:25 +0000 |
| commit | 34d54b1d849298c49efbc75aaafe7933a83d5a10 (patch) | |
| tree | 87b910e708d06f8fe1bbbf0c89c54096872390df /src/net/java/sip/communicator/impl/protocol/jabber | |
| parent | 0030f69cee6e81301e332d75a16c923aa8d33401 (diff) | |
| download | jitsi-34d54b1d849298c49efbc75aaafe7933a83d5a10.zip jitsi-34d54b1d849298c49efbc75aaafe7933a83d5a10.tar.gz jitsi-34d54b1d849298c49efbc75aaafe7933a83d5a10.tar.bz2 | |
Moves the ConfigurationService and FileAccessService implementations from Jitsi into libjitsi. Silences handled exceptions in libjitsi by converting them into Logger informational messages.
Diffstat (limited to 'src/net/java/sip/communicator/impl/protocol/jabber')
4 files changed, 6 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/IceUdpTransportManager.java b/src/net/java/sip/communicator/impl/protocol/jabber/IceUdpTransportManager.java index c7c532f..82475f6 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/IceUdpTransportManager.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/IceUdpTransportManager.java @@ -15,13 +15,14 @@ import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.Candidat import net.java.sip.communicator.service.netaddr.*; import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.service.protocol.media.*; -import net.java.sip.communicator.util.*; +import net.java.sip.communicator.util.Logger; import org.ice4j.*; import org.ice4j.ice.*; import org.ice4j.ice.harvest.*; import org.ice4j.security.*; import org.jitsi.service.neomedia.*; +import org.jitsi.util.*; import org.jivesoftware.smack.packet.*; import org.xmpp.jnodes.smack.*; diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesServiceDiscovery.java b/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesServiceDiscovery.java index 1d571a0..0e5689b 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesServiceDiscovery.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesServiceDiscovery.java @@ -9,8 +9,9 @@ package net.java.sip.communicator.impl.protocol.jabber; import java.util.*; import java.util.concurrent.*; -import net.java.sip.communicator.util.*; +import net.java.sip.communicator.util.Logger; +import org.jitsi.util.*; import org.jivesoftware.smack.*; import org.jivesoftware.smack.filter.*; import org.jivesoftware.smack.packet.*; diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java index f12abe1..4a2c4c6 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java @@ -1361,7 +1361,7 @@ public class ProtocolProviderServiceJabberImpl new Presence(Presence.Type.unavailable); if(opSet != null - && !net.java.sip.communicator.util.StringUtils + && !org.jitsi.util.StringUtils .isNullOrEmpty(opSet.getCurrentStatusMessage())) { unavailablePresence.setStatus( diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf index fef6f8c..5406148 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf @@ -40,6 +40,7 @@ Import-Package: javax.net, org.jitsi.service.protocol, org.jitsi.service.resources, org.jitsi.service.version, + org.jitsi.util, org.jivesoftware.smack, org.jivesoftware.smack.filter, org.jivesoftware.smack.packet, |