From 817a8abc0c244c441d2e4a77807bdadf6517d26d Mon Sep 17 00:00:00 2001
From: rkv <rkv@opencascade.com>
Date: Wed, 17 Oct 2012 09:18:30 +0000
Subject: [PATCH] Validation cycle modification in the study configuration
 screen is fixed.

---
 .../org/splat/service/StudyServiceImpl.java   | 29 ++++++++++++++++++-
 .../src/spring/businessServiceContext.xml     |  3 +-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
index a917ac6..d120b69 100644
--- a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
+++ b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
@@ -40,6 +40,7 @@ import org.splat.dal.bo.som.Study.Properties;
 import org.splat.dal.dao.som.IDBuilderDAO;
 import org.splat.dal.dao.som.ScenarioDAO;
 import org.splat.dal.dao.som.StudyDAO;
+import org.splat.dal.dao.som.ValidationCycleDAO;
 import org.splat.kernel.InvalidPropertyException;
 import org.splat.kernel.MissedPropertyException;
 import org.splat.kernel.MultiplyDefinedException;
@@ -99,6 +100,11 @@ public class StudyServiceImpl implements StudyService {
 	 */
 	private ScenarioDAO _scenarioDAO;
 
+	/**
+	 * Injected validation cycle DAO.
+	 */
+	private ValidationCycleDAO _validationCycleDAO;
+
 	/**
 	 * Injected IDBuilder DAO.
 	 */
@@ -308,6 +314,7 @@ public class StudyServiceImpl implements StudyService {
 	 * @see org.splat.service.StudyService#setValidationCycle(org.splat.dal.bo.som.Study, org.splat.dal.bo.som.DocumentType,
 	 *      org.splat.dal.bo.som.ValidationCycle.Properties)
 	 */
+	@Transactional
 	public void setValidationCycle(Study aStudy, DocumentType type,
 			ValidationCycle.Properties vprop) {
 		HashMap<String, ValidationCycle> validactor = aStudy
@@ -324,8 +331,12 @@ public class StudyServiceImpl implements StudyService {
 			try {
 				cycle = new ValidationCycle(aStudy, vprop.setDocumentType(type));
 
+				getValidationCycleDAO().create(cycle); //RKV
+				
 				ValidationCycleRelation link = cycle.getContext();
-				aStudy.addRelation(link);
+//RKV:				aStudy.addRelation(link);
+				aStudy.getAllRelations().add(link); //RKV
+				
 				validactor.put(cname, link.getTo()); // Replaces the cycle if exists as default,
 			} catch (Exception error) {
 				logger.error("Unable to re-index Knowledge Elements, reason:",
@@ -727,4 +738,20 @@ public class StudyServiceImpl implements StudyService {
 	public void setScenarioDAO(ScenarioDAO scenarioDAO) {
 		_scenarioDAO = scenarioDAO;
 	}
+
+	/**
+	 * Get the validationCycleDAO.
+	 * @return the validationCycleDAO
+	 */
+	public ValidationCycleDAO getValidationCycleDAO() {
+		return _validationCycleDAO;
+	}
+
+	/**
+	 * Set the validationCycleDAO.
+	 * @param validationCycleDAO the validationCycleDAO to set
+	 */
+	public void setValidationCycleDAO(ValidationCycleDAO validationCycleDAO) {
+		_validationCycleDAO = validationCycleDAO;
+	}
 }
diff --git a/Workspace/Siman-Common/src/spring/businessServiceContext.xml b/Workspace/Siman-Common/src/spring/businessServiceContext.xml
index 5ada1f4..e2fa81d 100644
--- a/Workspace/Siman-Common/src/spring/businessServiceContext.xml
+++ b/Workspace/Siman-Common/src/spring/businessServiceContext.xml
@@ -85,7 +85,8 @@ http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
 		<property name="stepService" ref="stepService" />
 		<property name="studyDAO" ref="studyDAO" />
 		<property name="scenarioDAO" ref="scenarioDAO" />
-		<property name="IDBuilderDAO" ref="iDBuilderDAO" />
+        <property name="IDBuilderDAO" ref="iDBuilderDAO" />
+        <property name="validationCycleDAO" ref="validationCycleDAO" />
 	</bean>
 
 </beans>
\ No newline at end of file
-- 
2.39.2