Changeset 2005

Timestamp:

06/22/09 19:30:40 (3 years ago)

Author:

mswertz

Message:

Updated login framework to new database passing mechanism

Location:

molgenis3_3/src/org/molgenis/framework

Files:

• auth/Login.java (modified) (3 diffs)
• auth/SimpleLogin.java (modified) (3 diffs)
• screen/form/FormController.java (modified) (1 diff)

molgenis3_3/src/org/molgenis/framework/auth/Login.java

@@ -3 +3 @@
 import java.text.ParseException;
 
+import org.molgenis.framework.Database;
 import org.molgenis.framework.data.DatabaseException;
 import org.molgenis.framework.data.QueryRule;
@@ -15 +16 @@
          * Authenticate the user
          * 
-         * @param name
-         * @param password
+         * @param database to login to
+         * @param name of user
+         * @param password of user
          * @return
          */
-        public boolean login(String name, String password);
+        public boolean login(Database db, String name, String password);
 
         /**
@@ -31 +33 @@
          * @throws DatabaseException 
          */
-        public void reload() throws DatabaseException, ParseException;
+        public void reload(Database db) throws DatabaseException, ParseException;
 
         /**

molgenis3_3/src/org/molgenis/framework/auth/SimpleLogin.java

@@ -1 +1 @@
 package org.molgenis.framework.auth;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
+import org.molgenis.framework.Database;
 import org.molgenis.framework.data.QueryRule;
 import org.molgenis.util.Entity;
@@ -11 +8 @@
 
         @Override
-        public void reload() 
+        public void reload(Database db) 
         {
         }
@@ -79 +76 @@
 
         @Override
-        public boolean login(String name, String password)
+        public boolean login(Database db, String name, String password)
         {
                 // TODO Auto-generated method stub

molgenis3_3/src/org/molgenis/framework/screen/form/FormController.java

@@ -306 +306 @@
                 {
                         // reload login
-                        view.getRootScreen().getLogin().reload();
+                        view.getRootScreen().getLogin().reload(db);
 
                         pager.setDirty(true);