Siman codebase is refactored. Spring beans are introduced in the context.

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

diff --git a/Workspace/Siman/src/org/splat/simer/NewScenarioAction.java b/Workspace/Siman/src/org/splat/simer/NewScenarioAction.java
index c873e606fa4494b7288f1ea3b5894a4b5fcdc401..03106d28a1fa6555f85d4ea935a15dd83b4b35aa 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/NewScenarioAction.java
+++ b/Workspace/Siman/src/org/splat/simer/NewScenarioAction.java
@@ -8,11 +8,13 @@ import java.util.ResourceBundle;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
-import org.splat.som.Database;
-import org.splat.som.Publication;
-import org.splat.som.Scenario;
+import org.splat.dal.dao.som.Database;
+import org.splat.dal.bo.som.Publication;
+import org.splat.dal.bo.som.Scenario;
+import org.splat.service.ProjectElementService;
+import org.splat.service.StudyService;
 import org.splat.som.Step;
-import org.splat.som.Study;
+import org.splat.dal.bo.som.Study;
 import org.splat.wapp.Menu;
 
 
@@ -25,6 +27,8 @@ public class NewScenarioAction extends Action {
     private  int              scindex;
     private  int              bastep;
     private  ToDo             action;
+       private StudyService _studyService;
+       private ProjectElementService _projectElementService;
 
        private static final long serialVersionUID = -5586724442986956861L;
 
@@ -45,7 +49,7 @@ public class NewScenarioAction extends Action {
       myscene   = Arrays.asList(scene);
       scindex   = base.getIndex();
       mytitle   = locale.getString("label.scenario") + " " + String.valueOf(scene.length+1);
-      bastep    = base.getFirstStep().getNumber();      // Better use the last current step ?
+      bastep    = getProjectElementService().getFirstStep(base).getNumber();      // Better use the last current step ?
       selection = scindex + "." + bastep;
       action    = null;
       
@@ -62,7 +66,7 @@ public class NewScenarioAction extends Action {
       Scenario[] scene   = study.getScenarii();
 
       myscene   = Arrays.asList(scene);
-      bastep    = scene[0].getFirstStep().getNumber();  // All scenarios have the same first step number
+      bastep    = getProjectElementService().getFirstStep(scene[0]).getNumber();  // All scenarios have the same first step number
       action    = null;
         
       getMenu("scenario").selects(selection);
@@ -91,12 +95,12 @@ public class NewScenarioAction extends Action {
         Step[]              step  = null;        
         Scenario.Properties sprop = new Scenario.Properties().setManager(getConnectedUser()).setTitle(mytitle).setInsertAfter(bascene);
 
-        bastep = bascene.getFirstStep().getNumber();
+        bastep = getProjectElementService().getFirstStep(bascene).getNumber();
         if (this.sharesStep()) {
-          step = bascene.getSteps();
+          step = getProjectElementService().getSteps(bascene);
           sprop.setBaseStep(step[number-bastep]);
         }
-        bascene = study.addScenario(sprop);
+        bascene = getStudyService().addScenario(study, sprop);
         transax.commit();
 
 //      Update of the display
@@ -175,4 +179,41 @@ public class NewScenarioAction extends Action {
 //  ----------------------------
       return (Integer.valueOf(getSharedStep()) > bastep);
     }
+       /**
+        * Get the studyService.
+        * 
+        * @return the studyService
+        */
+       public StudyService getStudyService() {
+               return _studyService;
+       }
+
+       /**
+        * Set the studyService.
+        * 
+        * @param studyService
+        *            the studyService to set
+        */
+       public void setStudyService(StudyService studyService) {
+               _studyService = studyService;
+       }
+       /**
+        * Get the projectElementService.
+        * 
+        * @return the projectElementService
+        */
+       public ProjectElementService getProjectElementService() {
+               return _projectElementService;
+       }
+
+       /**
+        * Set the projectElementService.
+        * 
+        * @param projectElementService
+        *            the projectElementService to set
+        */
+       public void setProjectElementService(
+                       ProjectElementService projectElementService) {
+               _projectElementService = projectElementService;
+       }
 }
\ No newline at end of file