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

yanas at dev.java.net yanas at dev.java.net
Tue Feb 7 11:00:25 CET 2006


User: yanas   
Date: 2006/02/07 02:00:25

Log:
 Activator and manifest

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.3&r2=1.4
Delta lines:  +12 -87
---------------------
--- Activator.java	5 Feb 2006 21:38:15 -0000	1.3
+++ Activator.java	7 Feb 2006 10:00:22 -0000	1.4
@@ -3,12 +3,7 @@
 import java.util.Hashtable;
 
 import net.java.sip.communicator.impl.gui.main.CommunicatorMain;
-import net.java.sip.communicator.service.configuration.ConfigurationService;
-import net.java.sip.communicator.service.contactlist.MetaContact;
-import net.java.sip.communicator.service.contactlist.MetaContactGroup;
-import net.java.sip.communicator.service.contactlist.MetaContactListException;
-import net.java.sip.communicator.service.contactlist.MetaContactListService;
-import net.java.sip.communicator.service.contactlist.event.MetaContactListListener;
+import net.java.sip.communicator.impl.gui.main.login.LoginWindow;
 import net.java.sip.communicator.service.gui.UIService;
 import net.java.sip.communicator.service.protocol.AccountID;
 import net.java.sip.communicator.service.protocol.AccountManager;
@@ -16,12 +11,10 @@
 import net.java.sip.communicator.service.protocol.Contact;
 import net.java.sip.communicator.service.protocol.ProtocolNames;
 import net.java.sip.communicator.service.protocol.ProtocolProviderService;
-import net.java.sip.communicator.slick.protocol.icq.IcqSlickFixture;
 import net.java.sip.communicator.util.Logger;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 
 
@@ -35,6 +28,8 @@
 	
 	private CommunicatorMain communicatorMain = new CommunicatorMain();
 	
+	private LoginWindow	loginWindow = new LoginWindow();
+	
 	private AccountID icqAccountID;
 	
 	public void start(BundleContext bundleContext) throws Exception 
@@ -47,14 +42,12 @@
             this.uiService =
                 new UIServiceImpl();
 
-            ServiceReference clistReference
-            	= bundleContext.getServiceReference(MetaContactListService.class.getName());
+            //ServiceReference clistReference
+            	//= bundleContext.getServiceReference(MetaContactListService.class.getName());
            
             //MetaContactListService contactListService
             	//= (MetaContactListService)bundleContext.getService(clistReference);
             
-            MetaContactListService contactListService = new MetaContactListServiceImpl(); 
-            
             ServiceReference[] serRefs = null;
             String osgiFilter = "(" + AccountManager.PROTOCOL_PROPERTY_NAME
                                 + "="+ProtocolNames.ICQ+")";
@@ -79,8 +72,8 @@
                     ProtocolProviderService.class.getName(),
                     osgiFilter);
             
-            Object icqProtocolProvider
-            			= bundleContext.getService(serRefs[0]);
+            ProtocolProviderService icqProtocolProvider
+            			= (ProtocolProviderService)bundleContext.getService(serRefs[0]);
             
             logger.info("UI Service...[  STARTED ]");
 
@@ -89,9 +82,11 @@
                         
             logger.info("UI Service ...[REGISTERED]");
             
-            communicatorMain.setContactList(contactListService);
+            //communicatorMain.setContactList(contactListService);
             
             communicatorMain.show();
+            
+            loginWindow.show();
         }
         finally
         {
@@ -104,74 +99,4 @@
 		logger.info("UI Service ...[STOPED]");		
 	}
 	
-	private class MetaContactListServiceImpl 
-		implements MetaContactListService {
-
-		public MetaContactGroup getRoot() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public MetaContact findMetaContactByContact(Contact contact) {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public MetaContact findMetaContactByID(String metaContactID) {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public void addContactListListener(MetaContactListListener l) {
-			// TODO Auto-generated method stub
-			
-		}
-
-		public void removeContactListListener(MetaContactListListener l) {
-			// TODO Auto-generated method stub
-			
-		}
-
-		public void moveContact(Contact contact, MetaContact newParent) throws MetaContactListException {
-			// TODO Auto-generated method stub
-			
-		}
-
-		public void removeContact(Contact contact) throws MetaContactListException {
-			// TODO Auto-generated method stub
-			
-		}
-
-		public void addNewContactToMetaContact(ProtocolProviderService provider, MetaContact metaContact, String contactID) throws MetaContactListException {
-			// TODO Auto-generated method stub
-			
-		}
-
-		public void createMetaContact(ProtocolProviderService provider, MetaContactGroup contactGroup, String contactID) throws MetaContactListException {
-			// TODO Auto-generated method stub
-			
-		}
-
-		public void moveMetaContact(MetaContact metaContact, MetaContactGroup newGroup) throws MetaContactListException {
-			// TODO Auto-generated method stub
-			
-		}
-
-		public void removeMetaContact(MetaContact metaContact) throws MetaContactListException {
-			// TODO Auto-generated method stub
-			
-		}
-
-		public void createMetaContactGroup(String groupName) throws MetaContactListException {
-			// TODO Auto-generated method stub
-			
-		}
-
-		public void removeMetaContactGroup(MetaContactGroup groupToRemove) throws MetaContactListException {
-			// TODO Auto-generated method stub
-			
-		}
-		
-	}
-
 }

File [changed]: swing.ui.manifest.mf
Url: https://sip-communicator-1-0-draft.dev.java.net/source/browse/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf?r1=1.1&r2=1.2
Delta lines:  +6 -1
-------------------
--- swing.ui.manifest.mf	5 Feb 2006 19:23:43 -0000	1.1
+++ swing.ui.manifest.mf	7 Feb 2006 10:00:22 -0000	1.2
@@ -4,4 +4,9 @@
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.service.configuration,
+ net.java.sip.communicator.service.configuration.event,
+ net.java.sip.communicator.service.protocol,
+ net.java.sip.communicator.service.protocol.icqconstants,
+ net.java.sip.communicator.service.protocol.event




---------------------------------------------------------------------
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