From: mka <mka@opencascade.com>
Date: Wed, 16 Jan 2013 11:14:59 +0000 (+0000)
Subject: updated
X-Git-Tag: Root_Delivery2_2013_04_22~182
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a88a74c92a771f979e52a78cab3cc8b0bc1b6238;p=tools%2Fsiman.git

updated
---

diff --git a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
index b8edad5..9223852 100644
--- a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
+++ b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
@@ -34,12 +34,12 @@ import org.splat.dal.bo.som.Publication;
 import org.splat.dal.bo.som.Scenario;
 import org.splat.dal.bo.som.SimulationContext;
 import org.splat.dal.bo.som.Study;
+import org.splat.dal.bo.som.Study.Properties;
 import org.splat.dal.bo.som.ValidationCycle;
+import org.splat.dal.bo.som.ValidationCycle.Actor;
 import org.splat.dal.bo.som.ValidationCycleRelation;
 import org.splat.dal.bo.som.ValidationStep;
 import org.splat.dal.bo.som.Visibility;
-import org.splat.dal.bo.som.Study.Properties;
-import org.splat.dal.bo.som.ValidationCycle.Actor;
 import org.splat.dal.dao.som.IDBuilderDAO;
 import org.splat.dal.dao.som.ScenarioDAO;
 import org.splat.dal.dao.som.StudyDAO;
@@ -990,7 +990,7 @@ public class StudyServiceImpl implements StudyService {
 		
 		aStudy.setMarkreference(1);
 		aStudy.setProgressState(ProgressState.TEMPLATE);
-		getStudyDAO().update(aStudy);
+		getStudyDAO().merge(aStudy);
 	}
 	
 	/**
@@ -1004,7 +1004,7 @@ public class StudyServiceImpl implements StudyService {
 		
 		aStudy.setMarkreference(0);
 		aStudy.setProgressState(ProgressState.APPROVED);
-		getStudyDAO().update(aStudy);
+		getStudyDAO().merge(aStudy);
 	}
 
 	/**