Show login only when there are no registered accounts

src/net/java/sip/communicator/impl/gui/GuiActivator.java

@@ -6,6 +6,9 @@
  */
 package net.java.sip.communicator.impl.gui;
 
+import java.util.Hashtable;
+import java.util.Map;
+
 import net.java.sip.communicator.impl.gui.main.CommunicatorMain;
 import net.java.sip.communicator.impl.gui.main.MainFrame;
 import net.java.sip.communicator.impl.gui.main.WelcomeWindow;
@@ -13,10 +16,12 @@
 import net.java.sip.communicator.service.configuration.ConfigurationService;
 import net.java.sip.communicator.service.contactlist.MetaContactListService;
 import net.java.sip.communicator.service.gui.UIService;
+import net.java.sip.communicator.service.protocol.ProtocolProviderFactory;
 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;
 
 /**
@@ -25,7 +30,8 @@
  * @author Yana Stamcheva
  */
 public class GuiActivator implements BundleActivator {
-    private Logger logger = Logger.getLogger(GuiActivator.class.getName());
+    
+    private static Logger logger = Logger.getLogger(GuiActivator.class.getName());
 
     private UIService uiService = null;
 
@@ -36,6 +42,9 @@ public class GuiActivator implements BundleActivator {
     public static BundleContext bundleContext;
     
     private static ConfigurationService configService;
+    
+    private static Map providerFactoriesMap = new Hashtable();
+    
     /**
      * Called when this bundle is started.
      *
@@ -109,7 +118,7 @@ public void stop(BundleContext bundleContext) throws Exception {
      */
     private class RunLogin implements Runnable {
         public void run() {
-            loginManager.showLoginWindows(communicatorMain.getMainFrame());
+            loginManager.runLogin(communicatorMain.getMainFrame());
         }
     }
     
@@ -124,4 +133,30 @@ public static ConfigurationService getConfigurationService() {
         
         return configService;
     }
+    
+    public static Map getProtocolProviderFactories() {
+  
+        ServiceReference[] serRefs = null;
+        try {
+            //get all registered provider factories
+            serRefs = bundleContext.getServiceReferences(
+                    ProtocolProviderFactory.class.getName(), null);
+
+        } catch (InvalidSyntaxException e) {
+            logger.error("LoginManager : " + e);
+        }
+
+        for (int i = 0; i < serRefs.length; i++) {
+            
+            ProtocolProviderFactory providerFactory
+                = (ProtocolProviderFactory) bundleContext
+                    .getService(serRefs[i]);
+
+            providerFactoriesMap.put(serRefs[i].getProperty(
+                    ProtocolProviderFactory.PROTOCOL_PROPERTY_NAME),
+                    providerFactory);
+        }
+        
+        return providerFactoriesMap;
+    }
 }

src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java

@@ -221,7 +221,7 @@ public void actionPerformed(ActionEvent e) {
      */
     private class RunLogin implements Runnable {
         public void run() {
-            loginManager.showLoginWindows(communicator.getMainFrame());
+            loginManager.runLogin(communicator.getMainFrame());
         }
     }
     

src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java

@@ -7,6 +7,7 @@
 
 package net.java.sip.communicator.impl.gui.main.login;
 
+import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;
@@ -30,8 +31,6 @@
 import net.java.sip.communicator.service.protocol.event.RegistrationStateChangeListener;
 import net.java.sip.communicator.util.Logger;
 
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 
 /**
@@ -50,75 +49,51 @@
  */
 public class LoginManager implements RegistrationStateChangeListener {
 
-    private BundleContext bc;
-
-    private Hashtable providerFactoriesMap = new Hashtable();
-
-    private Hashtable loginWindows = new Hashtable();
-
-    private AccountID accountID;
-
     private Logger logger = Logger.getLogger(LoginManager.class.getName());
+    
+    private Hashtable loginWindows = new Hashtable();
 
     private MainFrame mainFrame;
-
+       
     /**
-     * Creates an instance of <tt>LoginManager</tt> by specifying the
-     * <tt>BundleContext</tt>, from which to obtain all registered
-     * <tt>ProtocolProviderFactory</tt>s.
+     * In the given <tt>ProtocolProviderFactory</tt> creates an account 
+     * for the given user and password.
+     * 
+     * @param providerFactory The <tt>ProtocolProviderFactory</tt> where the
+     * new account is created.
+     * @param user The user identifier for this account.
+     * @param passwd The password for this account.
      * 
-     * @param bc The <tt>BundleContext</tt>.
+     * @return The <tt>AccountID</tt> of the newly created account.
      */
-    public LoginManager() {
+    public AccountID installAccount( ProtocolProviderFactory providerFactory,
+                                String user,
+                                String passwd) {
 
-        this.bc = GuiActivator.bundleContext;
-
-        ServiceReference[] serRefs = null;
-        try {
-            //get all registered provider factories
-            serRefs = this.bc.getServiceReferences(ProtocolProviderFactory.class
-                    .getName(), null);
-
-        } catch (InvalidSyntaxException e) {
-
-            logger.error("LoginManager : " + e);
-        }
-
-        for (int i = 0; i < serRefs.length; i++) {
-
-            ProtocolProviderFactory providerFactory
-                = (ProtocolProviderFactory) this.bc.getService(serRefs[i]);
-
-            this.providerFactoriesMap.put(serRefs[i].getProperty(
-                    ProtocolProviderFactory.PROTOCOL_PROPERTY_NAME),
-                    providerFactory);
-        }
+        Hashtable accountProperties = new Hashtable();
+        accountProperties.put(AccountProperties.PASSWORD, passwd);
+        
+        return providerFactory.installAccount(
+                    GuiActivator.bundleContext, user,
+                    accountProperties);
     }
-
+    
     /**
-     * Implements the login. Installs the account and registers
-     * the appropriate protocol provider.
+     * Registers the appropriate protocol provider for the given account.
      *
-     * @param providerFactory The ProtocolProviderFactory where the account
-     * should be installed.
-     * @param user The user identifier.
-     * @param passwd The password.
+     * @param providerFactory the ProtocolProviderFactory where the account
+     * should be installed
+     * @param accountID the account to register
      */
-    public void login(ProtocolProviderFactory providerFactory,
-                        String user,
-                        String passwd) {
-
-        Hashtable accountProperties = new Hashtable();
-        accountProperties.put(AccountProperties.PASSWORD, passwd);
-
-        this.accountID = providerFactory.installAccount(this.bc, user,
-                accountProperties);
-
+    public void login(  ProtocolProviderFactory providerFactory,
+                        AccountID accountID) {
+        
         ServiceReference serRef = providerFactory
-                .getProviderForAccount(this.accountID);
+                .getProviderForAccount(accountID);
 
         ProtocolProviderService protocolProvider
-            = (ProtocolProviderService) this.bc.getService(serRef);
+            = (ProtocolProviderService) GuiActivator.bundleContext
+                .getService(serRef);
 
         this.mainFrame.addAccount(protocolProvider);
 
@@ -131,9 +106,9 @@ public void login(ProtocolProviderFactory providerFactory,
      * Shows login window for each registered account.
      * @param parent The parent MainFrame window.
      */
-    public void showLoginWindows(MainFrame parent) {
+    public void runLogin(MainFrame parent) {
 
-        Set set = this.providerFactoriesMap.entrySet();
+        Set set = GuiActivator.getProtocolProviderFactories().entrySet();
         Iterator iter = set.iterator();
 
         while (iter.hasNext()) {
@@ -143,8 +118,19 @@ public void showLoginWindows(MainFrame parent) {
                 = (ProtocolProviderFactory) entry.getValue();
             String protocolName = (String) entry.getKey();
 
-            showLoginWindow(parent, protocolName, providerFactory);
-
+            ArrayList accountsList
+                = providerFactory.getRegisteredAccounts();
+            
+            if(accountsList.size() > 0) {
+                for(int i = 0; i < accountsList.size(); i ++) {
+                    AccountID accountID = (AccountID)accountsList.get(i);
+                    
+                    this.login(providerFactory, accountID);
+                }
+            }
+            else {
+                showLoginWindow(parent, protocolName, providerFactory);
+            }
             //TEST SUPPORT FOR MORE ACCOUNTS!!!!!
             //showLoginWindow(parent, protocolName, providerFactory);
         }

src/net/java/sip/communicator/impl/gui/main/login/LoginWindow.java

@@ -36,6 +36,7 @@
 import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
 import net.java.sip.communicator.impl.gui.utils.Constants;
 import net.java.sip.communicator.impl.gui.utils.ImageLoader;
+import net.java.sip.communicator.service.protocol.AccountID;
 import net.java.sip.communicator.service.protocol.ProtocolProviderFactory;
 /**
  * The <tt>LoginWindow</tt> is the window where the user should type his
@@ -192,6 +193,11 @@ public ProtocolProviderFactory getProviderFactory() {
         return providerFactory;
     }
 
+    /**
+     * Handles the <tt>ActionEvent</tt> triggered when one of the buttons is
+     * clicked. When "Login" button is choosen installs a new account from
+     * the user input and logs in. 
+     */
     public void actionPerformed(ActionEvent e) {
 
         JButton button = (JButton) e.getSource();
@@ -201,9 +207,13 @@ public void actionPerformed(ActionEvent e) {
 
             this.dispose();
 
-            this.loginManager.login(providerFactory, uinComboBox
-                    .getSelectedItem().toString(), new String(passwdField
-                    .getPassword()));
+            AccountID accountID = this.loginManager.installAccount(
+                    providerFactory, 
+                    uinComboBox.getSelectedItem().toString(), 
+                    new String(passwdField.getPassword()));
+            
+            this.loginManager.login(providerFactory, accountID);
+            
         } else {
             this.dispose();
         }