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

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

diff --git a/Workspace/Siman/src/org/splat/simer/admin/SimulationContextAction.java b/Workspace/Siman/src/org/splat/simer/admin/SimulationContextAction.java
index 232e52c9dc9b78b5908a53d4e37e6bcfcf85fc0b..92b36c9b6aeeb3909797bc043c1d91ae57475d93 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/admin/SimulationContextAction.java
+++ b/Workspace/Siman/src/org/splat/simer/admin/SimulationContextAction.java
@@ -120,7 +120,7 @@ public class SimulationContextAction extends Action {
 
        public String doInitialize() {
                // -----------------------------
-               Session connex = Database.getSession();
+               Session connex = Database.getCurSession();
                Transaction transax = connex.beginTransaction();
                try {
                        SimulationContext.Properties cprop = new SimulationContext.Properties();
@@ -148,7 +148,7 @@ public class SimulationContextAction extends Action {
 
        public String doSelect() {
                // -------------------------
-               Session connex = Database.getSession();
+               Session connex = Database.getCurSession();
                Transaction transax = connex.beginTransaction();
                try {
                        SimulationContext.Properties cprop = new SimulationContext.Properties();
@@ -174,7 +174,7 @@ public class SimulationContextAction extends Action {
                                        kprop.setSimulationContexts(selected).setState(
                                                        ProgressState.inWORK));
 
-                       step = edition.getType().getAttachedStep();
+                       step = getSimulationContextService().getAttachedStep(edition.getType());
                        owner = new HashSet<ProjectElementFacade>();
                        for (Iterator<Proxy> i = kelm.iterator(); i.hasNext();) {
                                KnowledgeElement next = getKnowledgeElementService()
@@ -190,7 +190,7 @@ public class SimulationContextAction extends Action {
                        }
                        SimulationContextType.Properties sprop = new SimulationContextType.Properties();
                        List<SimulationContextType> types = getSimulationContextService()
-                                       .selectTypesWhere(sprop.setState(ProgressState.APPROVED));
+                                       .selectTypesWhere(sprop.setProgressState(ProgressState.APPROVED));
                        Locale[] support = ApplicationSettings.getSupportedLocales();
 
                        // Sort localized type names