From: mka <mka@opencascade.com>
Date: Thu, 31 Jan 2013 14:35:35 +0000 (+0000)
Subject: Rename the scenario functionality is implemented
X-Git-Tag: Root_Delivery2_2013_04_22~154
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=aa02c1b619810727cdd4fea24ffcdeb276d1296c;p=tools%2Fsiman.git

Rename the scenario functionality is implemented
---

diff --git a/Workspace/Siman-Common/src/org/splat/service/ScenarioService.java b/Workspace/Siman-Common/src/org/splat/service/ScenarioService.java
index 939a0ef..200d3a9 100644
--- a/Workspace/Siman-Common/src/org/splat/service/ScenarioService.java
+++ b/Workspace/Siman-Common/src/org/splat/service/ScenarioService.java
@@ -200,4 +200,10 @@ public interface ScenarioService {
 	 * @return true if removal succeeded
 	 */
 	boolean removeKnowledgeElement(Scenario scenario, KnowledgeElement kelm);
+	
+	/**
+	 * Rename the scenario.
+	 * @param scenario - the scenario with a new title.
+	 */
+	void renameScenario(final Scenario scenario);
 }
diff --git a/Workspace/Siman-Common/src/org/splat/service/ScenarioServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/ScenarioServiceImpl.java
index 75bcac1..ad4af9f 100644
--- a/Workspace/Siman-Common/src/org/splat/service/ScenarioServiceImpl.java
+++ b/Workspace/Siman-Common/src/org/splat/service/ScenarioServiceImpl.java
@@ -958,6 +958,16 @@ public class ScenarioServiceImpl implements ScenarioService {
 		}
 		return isOk;
 	}
+	
+	/**
+	 * 
+	 * {@inheritDoc}
+	 * @see org.splat.service.ScenarioService#renameScenario(java.lang.String)
+	 */
+	@Transactional
+	public void renameScenario(final Scenario scenario) {
+		getScenarioDAO().merge(scenario);
+	}
 
 	/**
 	 * Get the knowledgeElementDAO.
diff --git a/Workspace/Siman/WebContent/study/editScenarioProperties.jsp b/Workspace/Siman/WebContent/study/editScenarioProperties.jsp
index 35a2a63..0913a60 100644
--- a/Workspace/Siman/WebContent/study/editScenarioProperties.jsp
+++ b/Workspace/Siman/WebContent/study/editScenarioProperties.jsp
@@ -1,5 +1,8 @@
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
 <%@ taglib prefix="s" uri="/struts-tags"%>
+
+<s:url id="rename_scenario" value="valid-rename.action" includeParams="none" escapeAmp="false" />
+
     <script language="JavaScript">
 
     function checkin (message) {
@@ -16,7 +19,7 @@
       <div id=article-box>
         <div id=section>
           <s:text name="title.prop.scenario">
-            <s:param><s:property value="%{title}"/></s:param>
+            <s:param><s:property value="%{selectedScenarioTitle}"/></s:param>
           </s:text>
         </div>
         <div id=article-body class=text>
@@ -50,19 +53,19 @@
 
 <!-- Scenario ckecked-in (editable)
   -->   <s:else>
-        <form name="property" action="valid-rename" method="post">
+        <s:form name="property" action="%{rename_scenario}" method="post">
           <table class="text">
             <tr>
               <td><s:text name="field.scenariotitle"/>*:&nbsp;</td>
               <td>
-                <input type=text size="25" name=title value="<s:property value="title"/>">
+                <input type=text" size="25" name="selectedScenarioTitle" value="<s:property value="selectedScenarioTitle"/>">
               </td>
               <td>
                 <input type="submit" name="save"   value="<s:text name="button.save"/>"/>
               </td>
             </tr>
           </table>
-        </form>
+        </s:form>
         </s:else>
 
         </div>
diff --git a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java
index e9e6fdb..397dc82 100644
--- a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java
+++ b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java
@@ -491,7 +491,6 @@ public class ApplicationSettings {
 						"message.markasreference.study"));
 			}
 			
-			LOG.debug("MKA isPublic = " + isPublic);
 			if (isPublic) {
 				addItem(MNU_PUBLISH, new PopupItem(MNU_NAME_PROTECT).icon(
 						"image.publish.png").action("edit-study?action=protect")
diff --git a/Workspace/Siman/src/org/splat/simer/EditScenarioPropertiesAction.java b/Workspace/Siman/src/org/splat/simer/EditScenarioPropertiesAction.java
index e29124f..c6ddf7d 100644
--- a/Workspace/Siman/src/org/splat/simer/EditScenarioPropertiesAction.java
+++ b/Workspace/Siman/src/org/splat/simer/EditScenarioPropertiesAction.java
@@ -1,10 +1,13 @@
 package org.splat.simer;
 
 import java.text.SimpleDateFormat;
+import java.util.Iterator;
+import java.util.List;
 import java.util.ResourceBundle;
 
 import org.splat.dal.bo.kernel.User;
 import org.splat.dal.bo.som.Scenario;
+import org.splat.dal.bo.som.Study;
 import org.splat.kernel.InvalidPropertyException;
 import org.splat.service.ProjectElementService;
 import org.splat.service.ScenarioService;
@@ -22,6 +25,11 @@ public class EditScenarioPropertiesAction extends DisplayStudyStepAction {
 	private transient Scenario _myscenario;
 	private transient String _lasdate;
 	private transient String _subject;
+	
+	/**
+	 * Title of the selected scenario.
+	 */
+	private String _selectedScenarioTitle;
 
 	/**
 	 * The Scenario service.
@@ -51,6 +59,7 @@ public class EditScenarioPropertiesAction extends DisplayStudyStepAction {
 		_myscenario = (Scenario) step.getOwner(); // The selected step belong to a scenario
 		_lasdate = datstring.format(_myscenario.getLastModificationDate());
 		_subject = label.getString("label.study") + " " + _openStudy.getTitle();
+		_selectedScenarioTitle = _myscenario.getTitle();
 
 		initializationFullScreenContext(Constants.STUDY_MENU,
 				Constants.STUDY_MENU, "true", "back", "open");
@@ -93,6 +102,25 @@ public class EditScenarioPropertiesAction extends DisplayStudyStepAction {
 		return SUCCESS;
 	}
 
+	/**
+	 * Rename the scenario functionality.
+	 * @return SUCCESS
+	 */
+	public String doEditScenarioTitle() {
+		OpenStudy openStudy = getOpenStudy();
+		Study study = openStudy.getStudyObject();
+		List<Scenario> scenarios = study.getScenariiList();
+		Iterator<Scenario> iter = scenarios.iterator();
+		for (; iter.hasNext();) {
+			Scenario scenario = iter.next();
+			if (openStudy.getSelectedScenarioId().equals(String.valueOf(scenario.getIndex()))) {
+				scenario.setTitle(getSelectedScenarioTitle());				
+				_scenarioService.renameScenario(scenario);
+			}
+		}
+		return SUCCESS;
+	}
+	
 	// ==============================================================================================================================
 	// Getters
 	// ==============================================================================================================================
@@ -124,13 +152,28 @@ public class EditScenarioPropertiesAction extends DisplayStudyStepAction {
 		return _subject;
 	}
 
-	public String getTitle() {
-		return _myscenario.getTitle();
-	}
 
 	public boolean isCheckedout() {
 		return _myscenario.isCheckedout();
 	}
+	
+	
+
+	/**
+	 * Get the selectedScenarioTitle.
+	 * @return the selectedScenarioTitle
+	 */
+	public String getSelectedScenarioTitle() {
+		return _selectedScenarioTitle;
+	}
+
+	/**
+	 * Set the selectedScenarioTitle.
+	 * @param selectedScenarioTitle the selectedScenarioTitle to set
+	 */
+	public void setSelectedScenarioTitle(final String selectedScenarioTitle) {
+		_selectedScenarioTitle = selectedScenarioTitle;
+	}
 
 	/**
 	 * Get the scenarioService.
diff --git a/Workspace/Siman/src/struts.xml b/Workspace/Siman/src/struts.xml
index a313289..5683d74 100644
--- a/Workspace/Siman/src/struts.xml
+++ b/Workspace/Siman/src/struts.xml
@@ -330,17 +330,27 @@
 		</action>
 		<action name="markasref-study" class="editStudyAction"
 			method="markAsReference">
+			<interceptor-ref name="simanBasicStack" />
 			<result name="success" type="tiles">
 				page.displaystudy
 			</result>
 		</action>
 		<action name="removeasref-study" class="editStudyAction"
 			method="removeAsReference">
+			<interceptor-ref name="simanBasicStack" />
 			<result name="success" type="tiles">
 				page.displaystudy
 			</result>
 		</action>
 		
+		<action name="valid-rename" class="editScenarioPropertiesAction"
+			method="editScenarioTitle">
+			<interceptor-ref name="simanBasicStack" />
+			<result name="success" type="redirectAction">
+				open-study
+			</result>
+		</action>
+		
 		<action name="add-scenario" class="newScenarioAction"
 			method="initialize">
 			<result name="success" type="tiles">