X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=Workspace%2FSiman-Common%2Fsrc%2Forg%2Fsplat%2Fsom%2FStepRights.java;h=22f462b11621098d4d4007d52007aa5fd264af9a;hb=330b4ef8e6c87a25897847aaade03d2445bafb8c;hp=6a07bc88cd99b85254c12f209560a96f4130aca8;hpb=e2ce0069b9e8edf8719ff26b2b1a68498d108fbc;p=tools%2Fsiman.git diff --git a/Workspace/Siman-Common/src/org/splat/som/StepRights.java b/Workspace/Siman-Common/src/org/splat/som/StepRights.java index 6a07bc8..22f462b 100644 --- a/Workspace/Siman-Common/src/org/splat/som/StepRights.java +++ b/Workspace/Siman-Common/src/org/splat/som/StepRights.java @@ -11,18 +11,14 @@ import org.splat.dal.bo.kernel.User; import org.splat.dal.bo.som.ProjectElement; import org.splat.dal.bo.som.Scenario; import org.splat.dal.bo.som.Study; +import org.splat.service.ServiceLocatorImpl; public class StepRights { private User user; private Step operand; - -// ============================================================================================================================== -// Construction -// ============================================================================================================================== - - public StepRights (User user, Step step) { + public StepRights (User user, Step step) { // ---------------------------------------- this.user = user; this.operand = step; @@ -46,7 +42,7 @@ public class StepRights { public boolean canAddComment () { // ------------------------------- Study owner = operand.getOwnerStudy(); - return (owner.getAuthor().equals(user) || owner.hasActor(user)); + return (owner.getAuthor().equals(user) || ServiceLocatorImpl.getInstance().getStudyService().hasActor(owner, user)); } /** @@ -58,7 +54,7 @@ public class StepRights { public boolean canCreateDocument () { // ----------------------------------- if (!isEnabled()) return false; - return operand.getOwnerStudy().isStaffedBy(user); + return ServiceLocatorImpl.getInstance().getStudyService().isStaffedBy(operand.getOwnerStudy(), user); } /** @@ -69,7 +65,7 @@ public class StepRights { */ public boolean canCreateKnowledge () { // ------------------------------------ - return operand.getOwnerStudy().isStaffedBy(user); + return ServiceLocatorImpl.getInstance().getStudyService().isStaffedBy(operand.getOwnerStudy(), user); } /** @@ -81,7 +77,7 @@ public class StepRights { public boolean canEditSimulationContext () { // ------------------------------------------ Study owner = operand.getOwnerStudy(); - return (owner.getAuthor().equals(user) || owner.hasActor(user)); + return (owner.getAuthor().equals(user) || ServiceLocatorImpl.getInstance().getStudyService().hasActor(owner, user)); } /**