Refactoring continues: UserService is created instead of UserDirectory. Database...

[tools/siman.git] / Workspace / Siman / src / org / splat / simer / admin / ImportUserAction.java

diff --git a/Workspace/Siman/src/org/splat/simer/admin/ImportUserAction.java b/Workspace/Siman/src/org/splat/simer/admin/ImportUserAction.java
index 444cff8faaad22bab963be447a2c3cca87f25739..ee82a22e2be03ceaf92063336630ae8c2c987c86 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/admin/ImportUserAction.java
+++ b/Workspace/Siman/src/org/splat/simer/admin/ImportUserAction.java
@@ -8,7 +8,7 @@ import java.util.Set;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.splat.dal.bo.kernel.User;
-import org.splat.kernel.UserDirectory;
+import org.splat.service.UserService;
 import org.splat.service.technical.RepositoryService;
 import org.splat.simer.UploadBaseNextAction;
 import org.splat.dal.dao.som.Database;
@@ -28,21 +28,26 @@ public class ImportUserAction extends UploadBaseNextAction {
         */
        private RepositoryService _repositoryService;
 
+       /**
+        * Injected user service.
+        */
+       private UserService _userService;
+
 //  ==============================================================================================================================
 //  Action methods
 //  ==============================================================================================================================
 
     public String doImport () {
 //  -------------------------
-      Session      connex  = Database.getSession();
+      Session      connex  = Database.getCurSession();
       Transaction  transax = connex.beginTransaction();
       try {
         User       user    = getConnectedUser();     // The database administrator
        File       updir   = getRepositoryService().getDownloadDirectory(user);
        File       upfile  = new File(updir.getPath() + "/" + filename);
 
-        newsers = UserDirectory.importUsers(upfile);
-        users   = UserDirectory.selectAllUsers();
+        newsers = getUserService().importUsers(upfile);
+        users   = getUserService().selectAllUsers();
         for (Iterator<User> i=users.iterator(); i.hasNext(); ) {
           User next = i.next();
           if (!next.equals(user)) continue;
@@ -86,4 +91,20 @@ public class ImportUserAction extends UploadBaseNextAction {
        public void setRepositoryService(RepositoryService repositoryService) {
                _repositoryService = repositoryService;
        }
+
+       /**
+        * Get the userService.
+        * @return the userService
+        */
+       public UserService getUserService() {
+               return _userService;
+       }
+
+       /**
+        * Set the userService.
+        * @param userService the userService to set
+        */
+       public void setUserService(UserService userService) {
+               _userService = userService;
+       }
 }
\ No newline at end of file