Made the user manager not to attempt to log in to account types the user

do not have
bioclipse · Aug 16, 2012 · 88495e4 · 88495e4
1 parent 46a15e4
commit 88495e4
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 18 deletions.
diff --git a/plugins/net.bioclipse.usermanager/src/net/bioclipse/usermanager/User.java b/plugins/net.bioclipse.usermanager/src/net/bioclipse/usermanager/User.java
@@ -12,7 +12,10 @@
 package net.bioclipse.usermanager;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.Iterator;
 
 /**
  * The local user with username and password for 
@@ -71,7 +74,16 @@ String getUserName() {
     HashMap<String, Account> getAccounts() {
         return accounts;
     }
-
+
+    public ArrayList<String> getAccountTypes() {
+        ArrayList<String> accountTypes = new ArrayList<String>();
+        Collection<Account> myAccounts = accounts.values();
+        Iterator<Account> itr = myAccounts.iterator();
+        while (itr.hasNext())
+            accountTypes.add( itr.next().getAccountType().getName() );
+        return accountTypes;
+    }
+
     void addAccount(Account account) {
         accounts.put( account.getAccountId(), account );
     }

diff --git a/plugins/net.bioclipse.usermanager/src/net/bioclipse/usermanager/UserContainer.java b/plugins/net.bioclipse.usermanager/src/net/bioclipse/usermanager/UserContainer.java
@@ -181,7 +181,8 @@ public boolean isLoggedIn() {
      *  Signs out the current superuser
      */
     public void signOut() {
-        loggedInUser.clearLoggedInAccounts();
+        if(loggedInUser != null)
+            loggedInUser.clearLoggedInAccounts();
         loggedInUser  = null;
         textEncryptor = null;
         logger.debug( "Signed out user from usercontainer with id: "

diff --git a/plugins/net.bioclipse.usermanager/src/net/bioclipse/usermanager/business/UserManager.java b/plugins/net.bioclipse.usermanager/src/net/bioclipse/usermanager/business/UserManager.java
@@ -184,10 +184,14 @@ public boolean signInToAccount(AccountType accountType) {
      * log-in properties if the user have more than one account per account 
      * type in Bioclipse?*/
     private boolean fireLoggin(String accountType) {
+        boolean result = false;
         if (userContainer.isLoggedIn()) {
-            return listnerIds.get( accountType ).receiveUserManagerEvent( UserManagerEvent.LOGIN );
-        } else
-            return false;
+            for( IUserManagerListener listener : listeners) {
+                if (listener.getAccountType().equals( accountType ))
+                    result = listener.receiveUserManagerEvent( UserManagerEvent.LOGIN );
+            }
+        } 
+        return result;
     }
 
     /**
@@ -206,19 +210,22 @@ private boolean fireLoginWithProgressBar( SubProgressMonitor monitor ) {
         try {
             for( IUserManagerListener listener : listeners) {
                 failedLogin.clear();
-                loginOK = listener.receiveUserManagerEvent( UserManagerEvent.LOGIN );
-                if (!loginOK) {
-                    name = listener.getClass().getName();
-                    failedLogin.add( name
-                                     .substring( 0, name.lastIndexOf( '.' ) ) );
-                } 
-                if (userContainer.getLoggedInUser().getLoggedInAccounts() != null ) {
-                    name = listener.getClass().getName();
-                    userContainer.getLoggedInUser().addLoggedInAccount( name.substring( 0, name.lastIndexOf( '.' ) ), loginOK );
-                }
-                if(usingMonitor) {
-                    monitor.beginTask("signing in", ticks);
-                    monitor.worked( ticks/listeners.size() );
+                name = listener.getClass().getName();
+                name = name.substring( 0, name.lastIndexOf( '.' ) );
+                ArrayList<String> userAccountTypes = userContainer.getLoggedInUser().getAccountTypes();
+
+                if (userAccountTypes.contains( listener.getAccountType() )) {
+                    loginOK = listener.receiveUserManagerEvent( UserManagerEvent.LOGIN );
+                    if (!loginOK) {                    
+                        failedLogin.add( name );
+                    } 
+                    if (userContainer.getLoggedInUser().getLoggedInAccounts() != null ) {
+                        userContainer.getLoggedInUser().addLoggedInAccount( name, loginOK );
+                    }
+                    if(usingMonitor) {
+                        monitor.beginTask("signing in", ticks);
+                        monitor.worked( ticks/listeners.size() );
+                    }
                 }
             }
             if( isLoggedIn() ) {