From c2222cb9e47029b593395fbea2047d88d2172332 Mon Sep 17 00:00:00 2001 From: rkv Date: Wed, 10 Oct 2012 12:55:34 +0000 Subject: [PATCH] New study creation is fixed. Search page is also accessible now. --- .../src/org/splat/dal/dao/som/Database.java | 33 ----- .../service/KnowledgeElementService.java | 2 + .../service/KnowledgeElementServiceImpl.java | 11 ++ .../src/org/splat/service/StudyService.java | 2 + .../org/splat/service/StudyServiceImpl.java | 26 +++- .../technical/ProjectSettingsServiceImpl.java | 7 +- .../Siman/src/org/splat/simer/Action.java | 22 ++- .../splat/simer/DisplayKnowledgeAction.java | 24 +++- .../splat/simer/DisplayStudyStepAction.java | 26 +++- .../src/org/splat/simer/OpenKnowledge.java | 24 +++- .../Siman/src/org/splat/simer/OpenStudy.java | 36 ++++- .../splat/simer/SimulationContextFacade.java | 22 +-- .../simer/admin/DatabaseIndexingAction.java | 23 ++- .../simer/admin/SimulationContextAction.java | 21 ++- .../Siman/src/spring/applicationContext.xml | 34 ++++- Workspace/Siman/src/struts.xml | 132 +++++++++--------- 16 files changed, 297 insertions(+), 148 deletions(-) diff --git a/Workspace/Siman-Common/src/org/splat/dal/dao/som/Database.java b/Workspace/Siman-Common/src/org/splat/dal/dao/som/Database.java index 3764a3d..9daff68 100644 --- a/Workspace/Siman-Common/src/org/splat/dal/dao/som/Database.java +++ b/Workspace/Siman-Common/src/org/splat/dal/dao/som/Database.java @@ -331,17 +331,6 @@ public class Database extends org.splat.dal.dao.kernel.Database { .uniqueResult(); } - public static KnowledgeElement selectKnowledgeElement(int index) { - // ----------------------------------------------------------------- - StringBuffer query = new StringBuffer( - "from KnowledgeElement where rid='").append(index).append("'"); - KnowledgeElement result = (KnowledgeElement) Database.getSession() - .createQuery(query.toString()).uniqueResult(); - - result.getOwnerScenario().getOwnerStudy().loadWorkflow(); - return result; - } - public static SimulationContext selectSimulationContext(int index) { // ------------------------------------------------------------------- StringBuffer query = new StringBuffer( @@ -400,28 +389,6 @@ public class Database extends org.splat.dal.dao.kernel.Database { query.toString()).list(); } - public static Study selectStudy(int index) { - // ------------------------------------------- - StringBuffer query = new StringBuffer("from Study where rid='").append( - index).append("'"); - Study result = (Study) Database.getSession().createQuery( - query.toString()).uniqueResult(); - - result.loadWorkflow(); - return result; - } - - public static Study selectStudy(String refid) { - // ---------------------------------------------- - StringBuffer query = new StringBuffer("from Study where sid='").append( - refid).append("'"); - Study result = (Study) Database.getSession().createQuery( - query.toString()).uniqueResult(); - - result.loadWorkflow(); - return result; - } - protected static IDBuilder selectIDBuilder(int cycle) { // ------------------------------------------------------ StringBuffer buffer = new StringBuffer("from IDBuilder where cycle='") diff --git a/Workspace/Siman-Common/src/org/splat/service/KnowledgeElementService.java b/Workspace/Siman-Common/src/org/splat/service/KnowledgeElementService.java index 5ccb94c..12cdc27 100644 --- a/Workspace/Siman-Common/src/org/splat/service/KnowledgeElementService.java +++ b/Workspace/Siman-Common/src/org/splat/service/KnowledgeElementService.java @@ -26,4 +26,6 @@ public interface KnowledgeElementService { public void rename(KnowledgeElement knowledgeElement, String title) throws InvalidPropertyException; + + public KnowledgeElement selectKnowledgeElement(int index); } diff --git a/Workspace/Siman-Common/src/org/splat/service/KnowledgeElementServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/KnowledgeElementServiceImpl.java index 1c107d5..b2c9b39 100644 --- a/Workspace/Siman-Common/src/org/splat/service/KnowledgeElementServiceImpl.java +++ b/Workspace/Siman-Common/src/org/splat/service/KnowledgeElementServiceImpl.java @@ -68,6 +68,17 @@ public class KnowledgeElementServiceImpl implements KnowledgeElementService { update(knowledgeElement); } + public KnowledgeElement selectKnowledgeElement(int index) { + // ----------------------------------------------------------------- + StringBuffer query = new StringBuffer( + "from KnowledgeElement where rid='").append(index).append("'"); + KnowledgeElement result = (KnowledgeElement) Database.getSession() + .createQuery(query.toString()).uniqueResult(); + + result.getOwnerScenario().getOwnerStudy().loadWorkflow(); + return result; + } + /** * @return */ diff --git a/Workspace/Siman-Common/src/org/splat/service/StudyService.java b/Workspace/Siman-Common/src/org/splat/service/StudyService.java index e8d8c6f..d697bb4 100644 --- a/Workspace/Siman-Common/src/org/splat/service/StudyService.java +++ b/Workspace/Siman-Common/src/org/splat/service/StudyService.java @@ -29,6 +29,8 @@ public interface StudyService { public int generateLocalIndex(Study aStudy); + public Study selectStudy(int index); + public Study createStudy(Study.Properties sprop) throws MissedPropertyException, InvalidPropertyException, MultiplyDefinedException, RuntimeException; diff --git a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java index 374c043..a9fe8b4 100644 --- a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java +++ b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java @@ -63,6 +63,28 @@ public class StudyServiceImpl implements StudyService { private ProjectElementService _projectElementService; + public Study selectStudy(int index) { + // ------------------------------------------- + StringBuffer query = new StringBuffer("from Study where rid='").append( + index).append("'"); + Study result = (Study) Database.getSession().createQuery( + query.toString()).uniqueResult(); + + result.loadWorkflow(); + return result; + } + + public Study selectStudy(String refid) { + // ---------------------------------------------- + StringBuffer query = new StringBuffer("from Study where sid='").append( + refid).append("'"); + Study result = (Study) Database.getSession().createQuery( + query.toString()).uniqueResult(); + + result.loadWorkflow(); + return result; + } + public Study createStudy(Study.Properties sprop) throws MissedPropertyException, InvalidPropertyException, MultiplyDefinedException, RuntimeException { @@ -292,7 +314,7 @@ public class StudyServiceImpl implements StudyService { public int generateLocalIndex(Study aStudy) { aStudy.setLastLocalIndex(aStudy.getLastLocalIndex() + 1); - Database.getSession().update(this); + Database.getSession().update(aStudy); return aStudy.getLastLocalIndex(); } @@ -320,7 +342,7 @@ public class StudyServiceImpl implements StudyService { aStudy.getScenariiList().add( aStudy.getScenariiList().indexOf(previous) + 1, scenario); } - session.update(this); // No need to update the Lucene index + session.update(aStudy); // No need to update the Lucene index session.save(scenario); // Must be done after updating this study because of the back reference to the study if (sprop.getBaseStep() != null) { // No need to update the Knowledge Element index as Knowledge Elements are not copied diff --git a/Workspace/Siman-Common/src/org/splat/service/technical/ProjectSettingsServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/technical/ProjectSettingsServiceImpl.java index 9d6cfec..35b0665 100644 --- a/Workspace/Siman-Common/src/org/splat/service/technical/ProjectSettingsServiceImpl.java +++ b/Workspace/Siman-Common/src/org/splat/service/technical/ProjectSettingsServiceImpl.java @@ -86,16 +86,11 @@ public class ProjectSettingsServiceImpl implements ProjectSettingsService { // ============================================================================================================================== // Construction // ============================================================================================================================== - - public static ProjectSettingsServiceImpl getMe () { -// -------------------------------------- - if (my == null) my = new ProjectSettingsServiceImpl(); - return my; - } protected ProjectSettingsServiceImpl () { // ---------------------------- reprop = new Properties(); steps = new Vector(); + my = this; } // ============================================================================================================================== diff --git a/Workspace/Siman/src/org/splat/simer/Action.java b/Workspace/Siman/src/org/splat/simer/Action.java index 9766ed3..610ca53 100644 --- a/Workspace/Siman/src/org/splat/simer/Action.java +++ b/Workspace/Siman/src/org/splat/simer/Action.java @@ -23,6 +23,8 @@ public class Action extends ActionSupport implements SessionAware { private Map session; private String mercode; + private OpenStudy _openStudy; + private OpenKnowledge _openKnowledge; private static final long serialVersionUID = -895295026709526501L; protected static final Logger logger = Logger.getLogger(Action.class); @@ -99,17 +101,23 @@ public class Action extends ActionSupport implements SessionAware { // ------------------------------------ return (Menu)session.get("menu." + name); } + public void setOpenKnowledge (OpenKnowledge kelm) { + _openKnowledge = kelm; + } protected OpenKnowledge getOpenKnowledge () { -// ------------------------------------------- - return (OpenKnowledge)session.get("knowledge.open"); // May be null + _openKnowledge = (OpenKnowledge)session.get("knowledge.open"); // May be null + return _openKnowledge; } - protected OpenStudy getOpenStudy () { -// ----------------------------------- - return (OpenStudy)session.get("study.open"); // May be null + public void setOpenStudy (OpenStudy aStudy) { + _openStudy = aStudy; } + public OpenStudy getOpenStudy () { + _openStudy = (OpenStudy)session.get("study.open"); + return _openStudy; // May be null + } protected OpenKnowledge open (KnowledgeElement kelm) { // ---------------------------------------------------- - OpenKnowledge open = new OpenKnowledge(kelm); + OpenKnowledge open = _openKnowledge.open(kelm); closeKnowledge(); // Just in case session.put("knowledge.open", open); @@ -117,7 +125,7 @@ public class Action extends ActionSupport implements SessionAware { } protected OpenStudy open (Study study) { // -------------------------------------- - OpenStudy open = new OpenStudy(getConnectedUser(), study); // The connected user may be null + OpenStudy open = _openStudy.open(getConnectedUser(), study); // The connected user may be null closeStudy(); // Just in case session.put("study.open", open); diff --git a/Workspace/Siman/src/org/splat/simer/DisplayKnowledgeAction.java b/Workspace/Siman/src/org/splat/simer/DisplayKnowledgeAction.java index 988d6d5..a5fec95 100644 --- a/Workspace/Siman/src/org/splat/simer/DisplayKnowledgeAction.java +++ b/Workspace/Siman/src/org/splat/simer/DisplayKnowledgeAction.java @@ -6,12 +6,15 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.splat.dal.dao.som.Database; import org.splat.dal.bo.som.KnowledgeElement; +import org.splat.service.KnowledgeElementService; import org.splat.som.Step; public class DisplayKnowledgeAction extends DisplayBaseAction { protected OpenKnowledge myknelm = null; // Knowledge Element details + + private KnowledgeElementService _knowledgeElementService; private static final long serialVersionUID = 8473504456981431762L; @@ -30,7 +33,7 @@ public class DisplayKnowledgeAction extends DisplayBaseAction { if (myknelm != null && myknelm.getIndex() == index) { // - The selected knowledge is currently open selection = myknelm.getSelection(); // Current selection } else { // - The selected knowledge is new - KnowledgeElement kelm = Database.selectKnowledgeElement(index); + KnowledgeElement kelm = getKnowledgeElementService().selectKnowledgeElement(index); myknelm = open(kelm); selection = myknelm.getSelection(); // Default selection } @@ -40,7 +43,7 @@ public class DisplayKnowledgeAction extends DisplayBaseAction { return ERROR; } else if (selection != null) { // Re-opening (refreshing) the currently open knowledge - KnowledgeElement kelm = Database.selectKnowledgeElement(myknelm.getIndex()); + KnowledgeElement kelm = getKnowledgeElementService().selectKnowledgeElement(myknelm.getIndex()); myknelm = open(kelm); // Closes the previously open knowledge myknelm.setSelection(selection); } @@ -114,4 +117,21 @@ public class DisplayKnowledgeAction extends DisplayBaseAction { // ------------------------------- return "false"; } + + /** + * Get the knowledgeElementService. + * @return the knowledgeElementService + */ + public KnowledgeElementService getKnowledgeElementService() { + return _knowledgeElementService; + } + + /** + * Set the knowledgeElementService. + * @param knowledgeElementService the knowledgeElementService to set + */ + public void setKnowledgeElementService( + KnowledgeElementService knowledgeElementService) { + _knowledgeElementService = knowledgeElementService; + } } \ No newline at end of file diff --git a/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java b/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java index 0c7d45f..b2d468c 100644 --- a/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java +++ b/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java @@ -7,6 +7,7 @@ import org.hibernate.Transaction; import org.splat.dal.dao.som.Database; import org.splat.dal.bo.som.ProjectElement; import org.splat.dal.bo.som.Scenario; +import org.splat.service.StudyService; import org.splat.som.StepRights; import org.splat.dal.bo.som.Study; import org.splat.wapp.PopupMenu; @@ -17,6 +18,8 @@ public class DisplayStudyStepAction extends DisplayBaseAction { protected OpenStudy mystudy = null; // Presented study + private StudyService _studyService; + private static final long serialVersionUID = 6467920934724352021L; // ============================================================================================================================== @@ -36,7 +39,7 @@ public class DisplayStudyStepAction extends DisplayBaseAction { selection = mystudy.getSelection(); // Current selection study = mystudy.getStudyObject(); // Current Study object } else { // - The selected study is new - study = Database.selectStudy(index); + study = getStudyService().selectStudy(index); mystudy = open(study); selection = mystudy.getSelection(); // Default selection } @@ -50,7 +53,7 @@ public class DisplayStudyStepAction extends DisplayBaseAction { study = mystudy.getStudyObject(); } else { // Re-opening (refreshing) the currently open study - study = Database.selectStudy(mystudy.getIndex()); + study = getStudyService().selectStudy(mystudy.getIndex()); mystudy = open(study); // Closes the previously open study mystudy.setSelection(selection); } @@ -161,4 +164,23 @@ public class DisplayStudyStepAction extends DisplayBaseAction { // ------------------------------- return String.valueOf(mystudy.isOpenForWriting()); } + + /** + * 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; + } } \ No newline at end of file diff --git a/Workspace/Siman/src/org/splat/simer/OpenKnowledge.java b/Workspace/Siman/src/org/splat/simer/OpenKnowledge.java index 6e5a903..86dfc0c 100644 --- a/Workspace/Siman/src/org/splat/simer/OpenKnowledge.java +++ b/Workspace/Siman/src/org/splat/simer/OpenKnowledge.java @@ -12,6 +12,7 @@ import org.splat.dal.bo.som.ProgressState; import org.splat.dal.bo.som.Scenario; import org.splat.dal.bo.som.SimulationContext; import org.splat.service.ProjectElementService; +import org.splat.service.technical.ProjectSettingsService; import org.splat.som.Step; import org.splat.wapp.SimpleMenu; @@ -20,6 +21,7 @@ public class OpenKnowledge extends OpenObject { private KnowledgeElement myknelm; private String credate; private ProjectElementService _projectElementService; + private ProjectSettingsService _projectSettingsService; public class Menu extends SimpleMenu { // ------------------------------------ @@ -48,7 +50,7 @@ public class OpenKnowledge extends OpenObject { // Constructor // ============================================================================================================================== - public OpenKnowledge(KnowledgeElement knelm) { + public OpenKnowledge open (KnowledgeElement knelm) { // --------------------------------------------- ResourceBundle label = ResourceBundle.getBundle("labels", ApplicationSettings.getCurrentLocale()); @@ -74,7 +76,7 @@ public class OpenKnowledge extends OpenObject { ustep = next; for (Iterator j = next .getAllSimulationContexts().iterator(); j.hasNext();) { - context.add(new SimulationContextFacade(j.next())); + context.add(new SimulationContextFacade(j.next(), getProjectSettings().getAllSteps())); } } value.append("

").append("") @@ -85,6 +87,7 @@ public class OpenKnowledge extends OpenObject { .append(".").append("

"); description = value.toString(); setupContents(); // Initializes documents and knowledge at ustep + return this; } // ============================================================================================================================== @@ -198,4 +201,21 @@ public class OpenKnowledge extends OpenObject { ProjectElementService projectElementService) { _projectElementService = projectElementService; } + + /** + * Get project settings. + * @return Project settings service + */ + private ProjectSettingsService getProjectSettings() { + return _projectSettingsService; + } + + /** + * Set project settings service. + * @param projectSettingsService project settings service + */ + public void setProjectSettings( + ProjectSettingsService projectSettingsService) { + _projectSettingsService = projectSettingsService; + } } \ No newline at end of file diff --git a/Workspace/Siman/src/org/splat/simer/OpenStudy.java b/Workspace/Siman/src/org/splat/simer/OpenStudy.java index 30f40f5..92673d2 100644 --- a/Workspace/Siman/src/org/splat/simer/OpenStudy.java +++ b/Workspace/Siman/src/org/splat/simer/OpenStudy.java @@ -27,6 +27,7 @@ import org.splat.dal.bo.som.DocumentType; import org.splat.dal.bo.som.KnowledgeElement; import org.splat.dal.bo.som.ProgressState; import org.splat.service.ProjectElementService; +import org.splat.service.ScenarioService; import org.splat.service.technical.ProjectSettingsService; import org.splat.dal.bo.som.Publication; import org.splat.som.Revision; @@ -50,6 +51,7 @@ public class OpenStudy extends OpenObject implements OpenStudyServices { private Publication selecdoc; private ProjectSettingsService _projectSettingsService; private ProjectElementService _projectElementService; + private ScenarioService _scenarioService; protected final static Logger logger = org.splat.simer.Action.logger; @@ -57,12 +59,12 @@ public class OpenStudy extends OpenObject implements OpenStudyServices { // Constructor // ============================================================================================================================== - public OpenStudy (User user, Study study) { + public OpenStudy open (User user, Study study) { // ----------------------------------------- ResourceBundle custom = ResourceBundle.getBundle("som", ApplicationSettings.getCurrentLocale()); - SimpleDateFormat datstring = new SimpleDateFormat(custom.getString("date.format")); + SimpleDateFormat datstring = new SimpleDateFormat(custom.getString("date.format")); Revision.Format verstring = new Revision.Format(getProjectSettings().getRevisionPattern()); - + cuser = user; // May be null if nobody connected mystudy = study; selection = "0.1"; // Default selection @@ -79,7 +81,7 @@ public class OpenStudy extends OpenObject implements OpenStudyServices { ustep.setActor(cuser); involving.add(ustep); for (Iterator i=ustep.getAllSimulationContexts().iterator(); i.hasNext(); ) { - context.add( new SimulationContextFacade(i.next()) ); + context.add( new SimulationContextFacade(i.next(), getProjectSettings().getAllSteps()) ); } if (mystudy.isStaffedBy(cuser) || mystudy.hasActor(cuser)) { // ProgressState state = mystudy.getProgressState(); @@ -92,8 +94,11 @@ public class OpenStudy extends OpenObject implements OpenStudyServices { urightstep = new StepRights(cuser, ustep); menu = new StudyMenu(mystudy); + ((StudyMenu)menu).setProjectElementService(getProjectElementService()); + ((StudyMenu)menu).setScenarioService(getScenarioService()); menu.selects(selection); // Initializes menu items to be displayed setupContents(); // Initializes documents and knowledge at ustep + return this; } // ============================================================================================================================== @@ -285,7 +290,7 @@ public class OpenStudy extends OpenObject implements OpenStudyServices { protected void add (SimulationContext contex) { // --------------------------------------------- - SimulationContextFacade facade = new SimulationContextFacade(contex); + SimulationContextFacade facade = new SimulationContextFacade(contex, getProjectSettings().getAllSteps()); context.add(facade); } @@ -377,7 +382,7 @@ public class OpenStudy extends OpenObject implements OpenStudyServices { context.clear(); for (Iterator i=involving.iterator(); i.hasNext(); ) { for (Iterator j=i.next().getAllSimulationContexts().iterator(); j.hasNext(); ) { - context.add( new SimulationContextFacade(j.next()) ); + context.add( new SimulationContextFacade(j.next(), getProjectSettings().getAllSteps()) ); } } } @@ -451,4 +456,23 @@ public class OpenStudy extends OpenObject implements OpenStudyServices { ProjectElementService projectElementService) { _projectElementService = projectElementService; } + + /** + * Get the scenarioService. + * + * @return the scenarioService + */ + public ScenarioService getScenarioService() { + return _scenarioService; + } + + /** + * Set the scenarioService. + * + * @param scenarioService + * the scenarioService to set + */ + public void setScenarioService(ScenarioService scenarioService) { + _scenarioService = scenarioService; + } } \ No newline at end of file diff --git a/Workspace/Siman/src/org/splat/simer/SimulationContextFacade.java b/Workspace/Siman/src/org/splat/simer/SimulationContextFacade.java index 1909107..3cd145f 100644 --- a/Workspace/Siman/src/org/splat/simer/SimulationContextFacade.java +++ b/Workspace/Siman/src/org/splat/simer/SimulationContextFacade.java @@ -1,6 +1,7 @@ package org.splat.simer; import java.util.Iterator; +import java.util.List; import java.util.ResourceBundle; import org.splat.dal.bo.som.ProgressState; @@ -17,19 +18,18 @@ public class SimulationContextFacade { private int step; private ProgressState state; private PopupMenu popup; - private ProjectSettingsService _projectSettingsService; // ============================================================================================================================== // Constructor // ============================================================================================================================== - public SimulationContextFacade (SimulationContext represented) { + public SimulationContextFacade (SimulationContext represented, List allSteps) { // -------------------------------------------------------------- my = represented; popup = ApplicationSettings.getPopupMenu("scontext"); SimulationContextType type = my.getType(); - for (Iterator i=getProjectSettings().getAllSteps().iterator(); i.hasNext(); ) { + for (Iterator i=allSteps.iterator(); i.hasNext(); ) { ProjectSettingsService.Step next = i.next(); if (!type.isAttachedTo(next)) continue; step = next.getNumber(); @@ -90,20 +90,4 @@ public class SimulationContextFacade { // --------------------------------------------------------- return my.equals(represented); } - /** - * Get project settings. - * @return Project settings service - */ - private ProjectSettingsService getProjectSettings() { - return _projectSettingsService; - } - - /** - * Set project settings service. - * @param projectSettingsService project settings service - */ - public void setProjectSettings( - ProjectSettingsService projectSettingsService) { - _projectSettingsService = projectSettingsService; - } } \ No newline at end of file diff --git a/Workspace/Siman/src/org/splat/simer/admin/DatabaseIndexingAction.java b/Workspace/Siman/src/org/splat/simer/admin/DatabaseIndexingAction.java index 303bde8..b3b0041 100644 --- a/Workspace/Siman/src/org/splat/simer/admin/DatabaseIndexingAction.java +++ b/Workspace/Siman/src/org/splat/simer/admin/DatabaseIndexingAction.java @@ -7,6 +7,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.splat.service.SearchService; import org.splat.service.SearchServiceImpl; +import org.splat.service.StudyService; import org.splat.simer.Action; import org.splat.dal.dao.som.Database; import org.splat.dal.bo.som.Study; @@ -18,6 +19,7 @@ public class DatabaseIndexingAction extends Action { private String indices; private SearchService _searchService; private ImportedStudy _importedStudy; + private StudyService _studyService; private static final long serialVersionUID = 4194268823457749655L; @@ -47,7 +49,7 @@ public class DatabaseIndexingAction extends Action { for (int i=0; i existing; // Existing simulation contexts of selected type private SearchService _searchService; private ProjectSettingsService _projectSettingsService; + private KnowledgeElementService _knowledgeElementService; private static final long serialVersionUID = 7083323229359094699L; @@ -136,7 +138,7 @@ public class SimulationContextAction extends Action { step = edition.getType().getAttachedStep(); owner = new HashSet(); for (Iterator i=kelm.iterator(); i.hasNext(); ) { - KnowledgeElement next = Database.selectKnowledgeElement(i.next().getIndex()); + KnowledgeElement next = getKnowledgeElementService().selectKnowledgeElement(i.next().getIndex()); ProjectElementFacade facade; if (step.appliesTo(Study.class)) facade = new ProjectElementFacade(next.getOwnerScenario().getOwnerStudy(), step); else facade = new ProjectElementFacade(next.getOwnerScenario(), step); @@ -241,4 +243,21 @@ public class SimulationContextAction extends Action { // --------------------------------------- selection = Integer.valueOf(index); } + + /** + * Get the knowledgeElementService. + * @return the knowledgeElementService + */ + public KnowledgeElementService getKnowledgeElementService() { + return _knowledgeElementService; + } + + /** + * Set the knowledgeElementService. + * @param knowledgeElementService the knowledgeElementService to set + */ + public void setKnowledgeElementService( + KnowledgeElementService knowledgeElementService) { + _knowledgeElementService = knowledgeElementService; + } } \ No newline at end of file diff --git a/Workspace/Siman/src/spring/applicationContext.xml b/Workspace/Siman/src/spring/applicationContext.xml index df90319..d915f68 100644 --- a/Workspace/Siman/src/spring/applicationContext.xml +++ b/Workspace/Siman/src/spring/applicationContext.xml @@ -12,6 +12,27 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> + + + + + + + + + + + + + + + + @@ -44,8 +65,9 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> class="org.splat.simer.SearchDocumentAction" scope="prototype"> - + + + + + + + @@ -127,6 +157,8 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> + diff --git a/Workspace/Siman/src/struts.xml b/Workspace/Siman/src/struts.xml index 210cdb0..65f7873 100644 --- a/Workspace/Siman/src/struts.xml +++ b/Workspace/Siman/src/struts.xml @@ -18,11 +18,11 @@ - + /welcome.jsp /error.jsp?error=initialization - + /home.jsp select?menu=search study/step-study @@ -30,7 +30,7 @@ /login.jsp /home.jsp?error=login - + /home.jsp /home.jsp select?menu=search @@ -39,7 +39,7 @@ /home.jsp /home.jsp - + study/new-empty study/search-study study/search-knowledge @@ -57,16 +57,16 @@ - + /study/error.jsp?message=notyetimplemented - + /study/newStudy.jsp - + open-study?selection=0.1 /study/newStudy.jsp /home.jsp?error=newstudy @@ -74,190 +74,190 @@ - + /study/searchStudy.jsp /home.jsp - + /study/searchStudy.jsp?action=setContext /study/searchStudy.jsp /study/searchStudy.jsp search-study - + /study/searchKnowledge.jsp - + /study/searchKnowledge.jsp?action=setContext /study/searchKnowledge.jsp /study/searchKnowledge.jsp search-knowledge - + /study/searchDocument.jsp - + /study/displayStudyStep.jsp - + /study/displayStudyStep.jsp - + /study/displayStudyStep.jsp - + /study/displayStudyStep.jsp - + /home.jsp - + /study/displayStudyProperties.jsp /study/editStudyProperties.jsp - + /study/displayKnowledge.jsp - + /study/displayKnowledge.jsp - + /study/displayKnowledge.jsp - + /study/displayKnowledge.jsp - + /home.jsp - + /study/displayStudyStep.jsp - + /study/newScenario.jsp?init=focus - + /study/editStudyProperties.jsp?action=edititle - + /study/editStudyProperties.jsp?action=edibutor - + /study/editStudyProperties.jsp?action=edicycle - + /study/newScenario.jsp - + step-study step-study /study/displayStudyStep.jsp?error=addScenario - + /study/editStudyProperties.jsp - + /study/editScenarioProperties.jsp - + /study/displayStudyStep.jsp - + /study/displayStudyStep.jsp?action=newContext /study/displayStudyStep.jsp?action=selectContext - + /study/displayStudyStep.jsp?action=newContext /study/displayStudyStep.jsp?action=setContext&index=%{contextType.index} - + /study/displayStudyStep.jsp /study/displayStudyStep.jsp?action=newContext /study/displayStudyStep.jsp?error=addContext - + /study/displayStudyStep.jsp /study/displayStudyStep.jsp?action=setContext&index=%{contextType.index} /study/displayStudyStep.jsp?error=addContext - + /study/displayStudyStep.jsp /study/displayStudyStep.jsp?error=removeContext - + /study/upload.jsp - + step-study import-document?fileName=%{fileName} version-document?index=%{index}&fileName=%{fileName} attach-document?index=%{index}&fileName=%{fileName} /study/error.jsp?message=outofmemory - + /study/importDocument.jsp /study/importError.jsp?message=%{errorCode} - + step-study step-study /study/importError.jsp?message=%{errorCode}&action=back - + /study/versionDocument.jsp /study/importError.jsp?message=%{errorCode} - + step-study step-study /study/importError.jsp?message=%{errorCode}&action=back - + /study/displayStudyStep.jsp?action=display - + /study/displayStudyStep.jsp - + /study/displayStudyStep.jsp?action=display - + /study/displayStudyStep.jsp /study/displayStudyStep.jsp?error=removeDocument - + /study/displayStudyStep.jsp?action=addKnowledge&index=%{knowledgeType} - + /study/displayStudyStep.jsp - + /study/displayStudyStep.jsp?action=display - + /study/displayStudyStep.jsp /study/displayStudyStep.jsp?error=removeKnowledge @@ -269,44 +269,44 @@ - + /sadmin/indexStudies.jsp - + ../study/search-study - + /sadmin/upload.jsp - + importuser?fileName=%{fileName} - + /sadmin/displayUser.jsp - + /sadmin/approveSContext.jsp - + /sadmin/approveSContext.jsp - + /sadmin/approveKnowelm.jsp - + /sgeom/index.jsp - + /sgeom/index.jsp - + /sgeom/index.jsp @@ -315,13 +315,13 @@ - + /smesh/index.jsp - + /smesh/index.jsp - + /smesh/index.jsp -- 2.39.2