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

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

diff --git a/Workspace/Siman/src/org/splat/simer/StudyPropertiesAction.java b/Workspace/Siman/src/org/splat/simer/StudyPropertiesAction.java
index 5cb967c80f654e86d2c5409bc3a7227b666839c1..07e84c455952d61b484f4c01ce3896ba2decd1f9 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/StudyPropertiesAction.java
+++ b/Workspace/Siman/src/org/splat/simer/StudyPropertiesAction.java
@@ -4,16 +4,13 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
 
-import org.hibernate.Session;
-import org.hibernate.Transaction;
 import org.splat.kernel.InvalidPropertyException;
 import org.splat.kernel.Name;
 import org.splat.dal.bo.kernel.User;
-import org.splat.kernel.UserDirectory;
 import org.splat.service.DocumentTypeService;
 import org.splat.service.StudyService;
+import org.splat.service.UserService;
 import org.splat.som.ApplicationRights;
-import org.splat.dal.dao.som.Database;
 import org.splat.dal.bo.som.DocumentType;
 import org.splat.dal.bo.som.Study;
 import org.splat.som.StudyRights;
@@ -58,6 +55,11 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         */
        private DocumentTypeService _documentTypeService;
 
+       /**
+        * Injected user service.
+        */
+       private UserService _userService;
+
        /**
         * Save operation type enumeration pointing which section of properties has been edited.
         */
@@ -117,9 +119,8 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
        }
 
        public String doEditTitle() {
-               // ----------------------------
-               Session connex = Database.getSession();
-               Transaction transax = connex.beginTransaction();
+//             Session connex = Database.getCurSession();
+//             Transaction transax = connex.beginTransaction();
 
                mystudy = getOpenStudy();
                validation = new Vector<ValidationFacade>();
@@ -143,14 +144,13 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
                validor = null;
                other = null;
 
-               transax.commit();
+//             transax.commit();
                return SUCCESS;
        }
 
        public String doEditContributors() {
-               // -----------------------------------
-               Session connex = Database.getSession();
-               Transaction transax = connex.beginTransaction();
+//             Session connex = Database.getCurSession();
+//             Transaction transax = connex.beginTransaction();
 
                mystudy = getOpenStudy();
                validation = new Vector<ValidationFacade>();
@@ -170,7 +170,7 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
                if (validefault != null)
                        validation.add(validefault); // In order to be at the end
                member = getStudyService().getContributors(study);
-               staff = UserDirectory.selectAllUsers();
+               staff = getUserService().selectAllUsers();
                validor = null;
                other = null;
                User me = this.getConnectedUser();
@@ -181,14 +181,13 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
                                        || !he.canContributeToStudy())
                                i.remove();
                }
-               transax.commit();
+//             transax.commit();
                return SUCCESS;
        }
 
        public String doEditCycle() {
-               // ----------------------------
-               Session connex = Database.getSession();
-               Transaction transax = connex.beginTransaction();
+//             Session connex = Database.getCurSession();
+//             Transaction transax = connex.beginTransaction();
 
                mystudy = getOpenStudy();
                validation = new Vector<ValidationFacade>();
@@ -214,7 +213,7 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
                member = getStudyService().getContributors(study);
                validor = new Vector<Name>();
                staff = null;
-               List<User> user = UserDirectory.selectAllUsers();
+               List<User> user = getUserService().selectAllUsers();
                for (Iterator<User> i = user.iterator(); i.hasNext();) {
                        User next = i.next();
                        ApplicationRights he = new ApplicationRights(next);
@@ -225,14 +224,14 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
                                        validor.add(next);
                        }
                }
-               transax.commit();
+//             transax.commit();
                return SUCCESS;
        }
 
        public String doEdition() {
                // --------------------------
-               Session connex = Database.getSession();
-               Transaction transax = connex.beginTransaction();
+//             Session connex = Database.getCurSession();
+//             Transaction transax = connex.beginTransaction();
                Study study = getOpenStudy().getStudyObject();
 
                if (tosave == Save.title) {
@@ -277,7 +276,7 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
                                if (parsenew[i].length() == 0)
                                        continue; // No any new contributor
                                int index = Integer.valueOf(parsenew[i].trim());
-                               User newser = UserDirectory.selectUser(index);
+                               User newser = getUserService().selectUser(index);
 
                                getStudyService().addContributor(study, newser);
                        }
@@ -287,20 +286,20 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
                        DocumentType apply = getDocumentTypeService().selectType(type);
                        ValidationCycle.Properties vprop = new ValidationCycle.Properties();
                        if (publisher > 0) {
-                               User actor = UserDirectory.selectUser(publisher);
+                               User actor = getUserService().selectUser(publisher);
                                vprop.setActor(ValidationStep.PROMOTION, actor);
                        }
                        if (reviewer > 0) {
-                               User actor = UserDirectory.selectUser(reviewer);
+                               User actor = getUserService().selectUser(reviewer);
                                vprop.setActor(ValidationStep.REVIEW, actor);
                        }
                        if (approver > 0) {
-                               User actor = UserDirectory.selectUser(approver);
+                               User actor = getUserService().selectUser(approver);
                                vprop.setActor(ValidationStep.APPROVAL, actor);
                        }
                        getStudyService().setValidationCycle(study, apply, vprop);
                }
-               transax.commit();
+//             transax.commit();
 
                doInitialize(); // Re-initialization following the above edition
                return SUCCESS;
@@ -456,4 +455,20 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
        public void setDocumentTypeService(DocumentTypeService documentTypeService) {
                _documentTypeService = documentTypeService;
        }
+
+       /**
+        * 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