[sc1.0-cvs] CVS update: /sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/, /sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/login/

yanas at dev.java.net yanas at dev.java.net
Fri Feb 24 11:43:53 CET 2006


User: yanas   
Date: 2006/02/24 02:43:53

Log:
 MetaContactListService added

File Changes:

Directory: /sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/
==============================================================================

File [changed]: Activator.java
Url: https://sip-communicator-1-0-draft.dev.java.net/source/browse/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/Activator.java?r1=1.9&r2=1.10
Delta lines:  +4 -10
--------------------
--- Activator.java	23 Feb 2006 15:34:53 -0000	1.9
+++ Activator.java	24 Feb 2006 10:43:50 -0000	1.10
@@ -4,11 +4,13 @@
 
 import net.java.sip.communicator.impl.gui.main.CommunicatorMain;
 import net.java.sip.communicator.impl.gui.main.login.LoginManager;
+import net.java.sip.communicator.service.contactlist.MetaContactListService;
 import net.java.sip.communicator.service.gui.UIService;
 import net.java.sip.communicator.util.Logger;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
 
 
 public class Activator implements BundleActivator
@@ -40,20 +42,12 @@
             this.uiService =
                 new UIServiceImpl();
 
-            //ServiceReference clistReference
-            //= bundleContext.getServiceReference(MetaContactListService.class.getName());
-
-            //MetaContactListService contactListService
-            //= (MetaContactListService)bundleContext.getService(clistReference);
-
             logger.info("UI Service...[  STARTED ]");
 
             bundleContext.registerService(
                     UIService.class.getName(), this.uiService, null);
 
             logger.info("UI Service ...[REGISTERED]");
-
-            //communicatorMain.setContactList(contactListService);
 
             communicatorMain.showCommunicator();
           

Directory: /sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/login/
=========================================================================================

File [changed]: LoginManager.java
Url: https://sip-communicator-1-0-draft.dev.java.net/source/browse/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java?r1=1.4&r2=1.5
Delta lines:  +9 -0
-------------------
--- LoginManager.java	23 Feb 2006 15:38:38 -0000	1.4
+++ LoginManager.java	24 Feb 2006 10:43:50 -0000	1.5
@@ -16,6 +16,7 @@
 import net.java.sip.communicator.impl.gui.main.MainFrame;
 import net.java.sip.communicator.impl.gui.main.i18n.Messages;
 import net.java.sip.communicator.impl.gui.main.utils.Constants;
+import net.java.sip.communicator.service.contactlist.MetaContactListService;
 import net.java.sip.communicator.service.protocol.AccountID;
 import net.java.sip.communicator.service.protocol.AccountManager;
 import net.java.sip.communicator.service.protocol.AccountProperties;
@@ -127,6 +128,14 @@
             
             this.mainFrame.setSupportedOperationSets(supportedOpSets);
             
+            ServiceReference clistReference
+                = bc.getServiceReference(MetaContactListService.class.getName());
+
+            MetaContactListService contactListService
+                = (MetaContactListService)bc.getService(clistReference);
+            
+            this.mainFrame.setContactList(contactListService);
+        
         }        
         else if(evt.getNewState()
                     .equals(RegistrationState.AUTHENTICATION_FAILED)){




---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe at sip-communicator-1-0-draft.dev.java.net
For additional commands, e-mail: cvs-help at sip-communicator-1-0-draft.dev.java.net





More information about the commits mailing list