More business logic has been moved from BO to services. ServiceLocator is created...

[tools/siman.git] / Workspace / Siman-Common / src / org / splat / som / StudyRights.java

diff --git a/Workspace/Siman-Common/src/org/splat/som/StudyRights.java b/Workspace/Siman-Common/src/org/splat/som/StudyRights.java
index 2d98eca8209b7024d1eb1cd1b25fa5a8e31306de..f83bf9b67f63bfadc3df804f7de9925afc360dfe 100644 (file)
--- a/Workspace/Siman-Common/src/org/splat/som/StudyRights.java
+++ b/Workspace/Siman-Common/src/org/splat/som/StudyRights.java
@@ -11,6 +11,7 @@ package org.splat.som;
 import org.splat.dal.bo.kernel.User;
 import org.splat.dal.bo.som.ProgressState;
 import org.splat.dal.bo.som.Study;
+import org.splat.service.ServiceLocatorImpl;
 
 
 public class StudyRights {
@@ -18,12 +19,7 @@ public class StudyRights {
     private User     user;
     private Study    operand;
     private boolean  author = false;                    // For optimizing 
-
-//  ==============================================================================================================================
-//  Construction
-//  ==============================================================================================================================
-
-    public StudyRights (User user, Study study) {
+       public StudyRights (User user, Study study) {
 //  -------------------------------------------
       this.user    = user;
       this.operand = study;
@@ -43,7 +39,7 @@ public class StudyRights {
     public boolean canAddScenario () {
 //  --------------------------------
       if (operand.getProgressState() != ProgressState.inWORK && operand.getProgressState() != ProgressState.inDRAFT) return false;
-      return operand.isStaffedBy(user);
+      return ServiceLocatorImpl.getInstance().getStudyService().isStaffedBy(operand, user);
     }
 
 /**
@@ -54,7 +50,7 @@ public class StudyRights {
  */
     public boolean canEditDescription () {
 //  ------------------------------------
-      return (operand.getAuthor().equals(user) || operand.hasActor(user));
+      return (operand.getAuthor().equals(user) || ServiceLocatorImpl.getInstance().getStudyService().hasActor(operand, user));
     }
 
     public boolean canEditProperties () {
@@ -89,7 +85,7 @@ public class StudyRights {
     public boolean canVersion () {
 //  ----------------------------
       if (operand.getProgressState() != ProgressState.inWORK && operand.getProgressState() != ProgressState.inDRAFT) return false;
-      return operand.isStaffedBy(user);
+      return ServiceLocatorImpl.getInstance().getStudyService().isStaffedBy(operand, user);
     }
 
 //  ==============================================================================================================================