Switches Jitsi trunk to libjitsi.

5 files changed, 15 insertions, 12 deletions

diff --git a/src/net/java/sip/communicator/impl/sysactivity/NetworkManagerListenerImpl.java b/src/net/java/sip/communicator/impl/sysactivity/NetworkManagerListenerImpl.java
index 6208a84..113d4b6 100644
--- a/src/net/java/sip/communicator/impl/sysactivity/NetworkManagerListenerImpl.java
+++ b/src/net/java/sip/communicator/impl/sysactivity/NetworkManagerListenerImpl.java
@@ -8,6 +8,7 @@ package net.java.sip.communicator.impl.sysactivity;
 

 import net.java.sip.communicator.service.sysactivity.event.*;

 import net.java.sip.communicator.util.*;

+

 import org.freedesktop.*;

 import org.freedesktop.dbus.*;

 import org.freedesktop.dbus.exceptions.*;

diff --git a/src/net/java/sip/communicator/impl/sysactivity/SysActivityActivator.java b/src/net/java/sip/communicator/impl/sysactivity/SysActivityActivator.java
index ea60cfc..90b30df 100644
--- a/src/net/java/sip/communicator/impl/sysactivity/SysActivityActivator.java
+++ b/src/net/java/sip/communicator/impl/sysactivity/SysActivityActivator.java
@@ -7,10 +7,10 @@
 package net.java.sip.communicator.impl.sysactivity;

 

 import net.java.sip.communicator.service.sysactivity.*;

-import org.osgi.framework.*;

-

 import net.java.sip.communicator.util.*;

 

+import org.osgi.framework.*;

+

 /**

  * Listens for system activity changes like sleep, network change, inactivity

  * and inform all its listeners.

@@ -23,8 +23,7 @@ public class SysActivityActivator
     /**

      * The logger.

      */

-    private Logger logger = Logger.getLogger(

-        SysActivityActivator.class.getName());

+    private final Logger logger = Logger.getLogger(SysActivityActivator.class);

 

     /**

      * The OSGi service registration.

diff --git a/src/net/java/sip/communicator/impl/sysactivity/SystemActivityEventDispatcher.java b/src/net/java/sip/communicator/impl/sysactivity/SystemActivityEventDispatcher.java
index be16d88..8e091a5 100644
--- a/src/net/java/sip/communicator/impl/sysactivity/SystemActivityEventDispatcher.java
+++ b/src/net/java/sip/communicator/impl/sysactivity/SystemActivityEventDispatcher.java
@@ -6,12 +6,12 @@
  */
 package net.java.sip.communicator.impl.sysactivity;
 
+import java.util.*;
+
 import net.java.sip.communicator.service.sysactivity.*;
 import net.java.sip.communicator.service.sysactivity.event.*;
 import net.java.sip.communicator.util.*;
 
-import java.util.*;
-
 /**
  * The class implements a dispatch event thread. The thread will
  * fire event every time it is added through the <tt>fireSystemActivityEvent()</tt>
diff --git a/src/net/java/sip/communicator/impl/sysactivity/SystemActivityNotificationsServiceImpl.java b/src/net/java/sip/communicator/impl/sysactivity/SystemActivityNotificationsServiceImpl.java
index ea3c78f..9a2ad63 100644
--- a/src/net/java/sip/communicator/impl/sysactivity/SystemActivityNotificationsServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/sysactivity/SystemActivityNotificationsServiceImpl.java
@@ -6,11 +6,13 @@
  */

 package net.java.sip.communicator.impl.sysactivity;

 

+import java.util.*;

+

 import net.java.sip.communicator.service.sysactivity.*;

 import net.java.sip.communicator.service.sysactivity.event.*;

-import net.java.sip.communicator.util.*;

+import net.java.sip.communicator.util.Logger;

 

-import java.util.*;

+import org.jitsi.util.*;

 

 /**

  * Service implementation listens for computer changes as sleeping, network

diff --git a/src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf b/src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf
index f60184d..3785a26 100644
--- a/src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf
+++ b/src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf
@@ -5,9 +5,10 @@ Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1

 System-Bundle: yes

 Import-Package: org.osgi.framework,

- net.java.sip.communicator.service.configuration,

- net.java.sip.communicator.service.resources,

- net.java.sip.communicator.util,

- net.java.sip.communicator.service.version

+ org.jitsi.service.version,

+ org.jitsi.service.configuration,

+ org.jitsi.util,

+ org.jitsi.service.resources, net.java.sip.communicator.service.resources,

+ net.java.sip.communicator.util

 Export-Package: net.java.sip.communicator.service.sysactivity,

     net.java.sip.communicator.service.sysactivity.event