From 615b422033eb4420ce0853e06b19709c3a07410f Mon Sep 17 00:00:00 2001
From: rkv <rkv@opencascade.com>
Date: Mon, 10 Dec 2012 13:07:30 +0000
Subject: [PATCH] displayStudy.jsp is removed, markup is fixed.
 KnowledgeElement deleting is fixed.

---
 .../splat/service/ScenarioServiceImpl.java    |  36 +-
 .../WebContent/WEB-INF/tiles/tiles-defs.xml   |  15 +-
 .../Siman/WebContent/jap/splat-launcher.jar   | Bin 377 -> 10713 bytes
 .../WebContent/jap/splat-signedlauncher.jar   | Bin 1437 -> 12434 bytes
 Workspace/Siman/WebContent/js/popup.js        |   6 -
 .../Siman/WebContent/jsp/editContext.jsp      |  12 +-
 .../Siman/WebContent/jsp/readKnowledge.jsp    |   2 +-
 .../Siman/WebContent/study/displayStudy.jsp   | 235 ---------
 .../WebContent/study/displayStudyStep.jsp     |  25 +-
 .../splat/simer/AbstractDisplayAction.java    |  24 +-
 .../simer/EditKnowledgeElementAction.java     |  99 ++--
 .../simer/EditSimulationContextAction.java    | 482 ++++++++++++------
 .../Siman/src/org/splat/simer/OpenStudy.java  |  54 +-
 Workspace/Siman/src/struts.xml                |  15 +-
 14 files changed, 468 insertions(+), 537 deletions(-)
 delete mode 100644 Workspace/Siman/WebContent/study/displayStudy.jsp

diff --git a/Workspace/Siman-Common/src/org/splat/service/ScenarioServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/ScenarioServiceImpl.java
index 0c250e9..fa1f31e 100644
--- a/Workspace/Siman-Common/src/org/splat/service/ScenarioServiceImpl.java
+++ b/Workspace/Siman-Common/src/org/splat/service/ScenarioServiceImpl.java
@@ -749,7 +749,8 @@ public class ScenarioServiceImpl implements ScenarioService {
 				aUser);
 		if (res) {
 			if (aScenario.isCheckedout()
-					&& (!aScenario.getUser().getUsername().equals(aUser.getUsername()))) {
+					&& (!aScenario.getUser().getUsername().equals(
+							aUser.getUsername()))) {
 				throw new NotApplicableException(MessageKeyEnum.SCN_000008
 						.toString(), scenarioId, aScenario.getUser()
 						.getUsername());
@@ -885,28 +886,27 @@ public class ScenarioServiceImpl implements ScenarioService {
 	 *            the knowledge element to remove
 	 * @return true if removal succeeded
 	 */
+	@Transactional
 	public boolean removeKnowledgeElement(final Scenario scenario,
 			final KnowledgeElement kelm) {
 		KnowledgeElement torem = scenario.getKnowledgeElement(kelm.getIndex());
-		if (torem == null) {
-			return false;
-		}
-		boolean done = scenario.getKnowledgeElements().remove(torem);
-		if (done) {
-			// Update of my transient data
-			// RKV: These transient data are not used indeed.
-			// RKV: List<KnowledgeElement> kelms = scenario.getKnowledgeByType().get(
-			// RKV: kelm.getType().getIndex());
-			// RKV: kelms.remove(torem);
-			if (scenario.getKnowledgeElementsList() != null) {
-				scenario.getKnowledgeElementsList().remove(torem);
+		boolean isOk = (torem != null);
+		if (isOk) {
+			isOk =  scenario.getKnowledgeElements().remove(torem);
+			if (isOk) {
+				getScenarioDAO().merge(scenario);
+				// Update of my transient data
+				// RKV: These transient data are not used indeed.
+				// RKV: List<KnowledgeElement> kelms = scenario.getKnowledgeByType().get(
+				// RKV: kelm.getType().getIndex());
+				// RKV: kelms.remove(torem);
+				if (scenario.getKnowledgeElementsList() != null) {
+					scenario.getKnowledgeElementsList().remove(torem);
+				}
+				// TODO: If the owner study is not private, remove the knowledge from the Lucene index
 			}
-			getScenarioDAO().update(scenario);
-			// TODO: If the owner study is not private, remove the knowledge from the Lucene index
-			return true;
-		} else {
-			return false;
 		}
+		return isOk;
 	}
 
 	/**
diff --git a/Workspace/Siman/WebContent/WEB-INF/tiles/tiles-defs.xml b/Workspace/Siman/WebContent/WEB-INF/tiles/tiles-defs.xml
index 4d1b001..878eceb 100644
--- a/Workspace/Siman/WebContent/WEB-INF/tiles/tiles-defs.xml
+++ b/Workspace/Siman/WebContent/WEB-INF/tiles/tiles-defs.xml
@@ -63,8 +63,21 @@
 </definition>
 
 <definition name="page.displaystudy" extends="baseLayout">
-	<put-attribute name="presentation_pane"   value="/study/displayStudyStep.jsp"/>
+    <put-attribute name="presentation_pane"   value="/study/displayStudyStep.jsp"/>
 </definition>
+<!-- RKV: BEGIN: Simulation contexts -->
+<definition name="page.newcontext" extends="baseLayout">
+    <put-attribute name="presentation_pane"   value="/study/displayStudyStep.jsp?action=newContext"/>
+</definition>
+
+<definition name="page.selectcontext" extends="baseLayout">
+    <put-attribute name="presentation_pane"   value="/study/displayStudyStep.jsp?action=selectContext"/>
+</definition>
+
+<definition name="page.setcontext" extends="baseLayout">
+    <put-attribute name="presentation_pane"   value="/study/displayStudyStep.jsp?action=setContext"/>
+</definition>
+<!-- RKV: END: Simulation contexts -->
 
 <definition name="page.displaystudyproperties" extends="baseLayout">
 	<put-attribute name="presentation_pane"   value="/study/displayStudyProperties.jsp"/>
diff --git a/Workspace/Siman/WebContent/jap/splat-launcher.jar b/Workspace/Siman/WebContent/jap/splat-launcher.jar
index 587729240e237305d318b1125e646dffdfb5c6ed..8bb900a7675a03b441a569a5d38ec62b47d738e8 100644
GIT binary patch
literal 10713
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

delta 135
zcmcZ^{F8|{z?+$civa}uSG7*$RT36q-~d9uRjrO-Q4lfFsa0>?%6$tb?wi=SP*7i7
zUz{Ppo1G);%98X-p!7^24)A7V5@CiLG<lAi5g)=Nkjlw-)C@#e*+Awo0bwnWeg@(&
F004dM9y|a5

diff --git a/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar b/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar
index cbec878846f83b184b45ad46ee9fe0ba25663a7c..f2a64e4b07b596017c197d1460ad8a100cb32c9d 100644
GIT binary patch
literal 12434
zcma)i19V;OwsvgWwy|RyJGO0GjoGHLZJUkJB#j!Uv5ls2WBlno_nfb%_dECgbB#U5
zyY_hJv-V!|ofvaIN<eT33=o*N>)Jn31mritcw5U$sEIJjC`dBPizvuQN~o$a$x9|D
z09E@~Fv4!Lj{*++!kF@qN5w4kiufVmBlncev6q{~MO6}#RQ$U{q=q23Tfb(x9`N0+
zj^L<dk&x2E4?tQp*)OUC7eJo#0}&)`&1mG)#}n7KU}P~gJ5|Q%iyImUcYHEbO{2&s
z#Azv(;Y_6qkE3h6d8jT;Z^~z<n;mO@n!97l1u@Ke$PG0R>d!VywW{Ool+&_-70VbY
z%wer&u}W&hg)opyYmkG5O*J2ZEG9E4s3(4M-hkP!;lt$!kE*ie)U$(j&OwB(?Ca`y
zkHi|SO$wG|Lh9|!kz8@WDa<1IWH&RG(I#QKM*p#8n;WddpoxFN*@J<ocdtm0%4(1l
zbA;J!Q<_ZbNU+HOzD}lW0k72KnJ0r_pocdrEOp!{y@P6n8SS_f9>UYOp_}=;#WnPk
z+dJmegz3grpX{MKt<01<gpMpb(aBZSnWSfp?`$poR>8AbV&#I8XDIn6*W8)P+?6s}
z&@V+E9as1qOT?XbFismQzNarpN<e6sVMxchAW#sHX)q8FrT;$@%895eh)GMRFsZ(o
z@T<eNFp9*j^iv3SV;U+O4hl1{@mv+cR1RS=XuQlCu2igJ#jVBL&o3)|PCAsPql34!
z!hunGFpduL5Ee#;o4wg%wrl~*w6eN`0=)bhg|*=o8)lZV7-A^}uBf~m`)rjLD%HHx
zi1nkQdB)_X8$xvdxo6itj4+%>yWex*P3B;3Og{LGKa*@p7z8|1t%?X!Gj(`o&nZxz
zF;Aebl0Trt_da9mW)F)aEBNkMPv*E8cl7hO)?uB7Jn3c{I$VFqX&o1Z7HKUB5fKhn
z36+-v7LM2OcG{etYJHahnY@RVqIl640_4u2!=ySwp|3b>WXY{BT4gp1{7_Bc&I=e~
zEXzqEXvCu3U%rRq-Ni4^`nWat*j>Vg6${Iq3Xv*OXHMU+=*zb*5Lt)}GJ9i<_kQ=t
zB}ycmxS^njR8jx24k>nlddj=Xc0Odx%!l!anYnG&M1*9ZP_Ei~_Z{v;rChO<-VDKU
zeb8ptHL@btWk`9WaYHLrcccCFIiG8fyF{6paEZ^{?GD54w5{d<;)(f*@Rw;vF*mx?
z-%R`XznT{Fckld{X;oB3*sV;u#|F#i_NQ;MQ{%I(MbNKML#Xz_<)Wg(SD~`(s+N7n
z<W#B<pjKfdqTn;qE)g@*8W1yZYFX;<9s+!9d*M?p%s?w@AZ;y>%#G14T;SPup+~`a
z2>R?CL}L6WYQp=Vf=NI<jG1m{Mh7}~pJocs#6-aT<496jB5bYVEL%<ED)Y;NSft<U
zrVR=8&MAIgVqILC{xYXDAq+(^#=vl#kd~UBQMjq523PdaE&B@S%65gYJK&9oh!}-1
zh8P_^h9FlMs7Fq5D$G~wOyuIl+Q7!bb;E)K@L=KKRI4~yEb6(P{x&~SeB0<=X<55U
zY>GNh+oTpRuOaL;F(RdUd*tOlbfTm7{p4Bn<ZgfY3(>3{F!kW^rCiII%j1KSM5EWH
z*;Q$SW>=41o%g5juepv<UA8eayV9J*%U+X!iGj`ZpQGIp!Ax)wsb}wAEq?@GWhd8W
z5=*duxqrEvna6ruPWX@>AB4)tnU0T-+X~>T(Y7D9T%7VMAhmgynq?q5LX-n-Ym!;q
zLrJ{oF1r<bX2}|JRuKf-cOdj~u)uHkF5fl9NoBu;Z^(6(Q$p~EF75ryRgcew-I>-G
z-iV2|+sSqRPkkzzK!(ij?X?c$R3f;njy9Xw<FgF7vpGd-epJU+J-VL7FPZj78QIU&
zu^B6b>~<#KK&iM8joJZLc7&TSp(Wl$t3i0#4AF=_xBU)16$q*KfZXi+q@By81O5e}
zLq;~Wkyody!5;P=6>LACf_MMkTEl)u+Xm|M;^_T8G8U6=rE}(wqXa_YOoNGoQFVPi
zXQt<N*CmA4)+(&WzKDHf#a7(<LngKKPnxvGGy5$;8)=QfQMCduyLX$-`Lg#{W9m`f
zw!}L77B{Ee({zw;u?iXn$xf{{=k0JWfd3<Q!Tnd#`T0lsfdzs1EB(BT{=W6<kF5}I
z0FEw}%)bKRKfwOn@$1`PJ6xUYjNN|Q_h-&S|F?a1#_kTLR^~4MrSSJjlKJly#2g(g
ztS#MLjNPmq9VEO=&7FQNm`v@AU0tIU>lMI6Q2auA)6pSBSWxl#;s=0stbq3)_Dw=&
zm=Aoacy5N*b6DqJqLV*-_z*^HbOeoipimfw#mVltKK73N>fz-H%!n8t2`<#ZPLx?&
zyw4|I+MOkF5P$GNC9E7(<BN|Q`mh8P0S4?iy)&biO2oQnh>~KFGFgUnqLZJ$uXG-|
zXmT_feN*;(n&je+$Dx&JT^iUu@Zw}b6dk^o*sVpp;(mWmQ5vKj_#+e8O3YR*(r>=S
zd)B<UvaVDmsP6zz+?&b4*sjkKSU=<_LvvowY9AmhnG(fA+YV}NVNSUf<Vj-HKIL7t
zd^ITP=X|dSH6)*;w148H-pfWl`m(8IY|*P1<m%mW8+t4zsJe5wZx_+5TgGk^pkR!M
zNFpU)bzo4fH~aEm$Hmo+WuM_K9*(_z{&T9M{Ch)4THBecxfnaRT9~{1_v=?*Q^i-u
zcwLLzWdd5k?-c@t0+*3h^75NCV4LSi)a~Ff!BVyt5*X@GJa!s_c)Ph{CcX)JTz|$M
zQXqC3#C|j~>b3T}QM`yn3Gf65ND~k)c3DpH+-7Y&XS*uC+}U2?27Yy-5C!{D!<DMV
zv@0(Z&-GEkWBn41>qlqug`B1L{3S&nm=x9+W}=5B6Dx0{k-1;c`Q3RJDJUz0lF%XV
z*Y2acM2l{#IS^wQ@!F-BABNavN0Ev%epBPxyf#Y2VvKG<{njh>l9536lvGyB%M@YL
z<?)Prnc2p<+ZeW!$(65Q*+;K|JS2I0tLoHe89YHRHP`S1JKdIiuHdgy=($N&SnnaB
zhAz?3O|1##t<>{kVF8*SDsP%#vtSTDWlCdOei#~!#(EZ=E=@FNlF35h{`5WH>8vFO
z&Fa~5Q*C<UfI(3TS^?;GN-w%Z9-itXDO^LdEM*Bfq25Q2ZA0RZQXi9OHRqHw2c+R4
z>W6e|G_%Mz;wh?aS!P8p^8kU`@-c0F4`I96VO}V#syX*<Xu6`m*Zj-jSFk|^x)~K2
zSZ(#r9<+Y-PCBPyN*0gwe)Odp@~KbwzNOO4c5>6PpdX5af$p(5HCyh3S&dJ|mdxbz
zb@+)|bO;Du;EuALq)ttdJmDBnOQlI8dPTOpn8fp}p)HgS386L-AGZk4m&G*%RxCdP
zPjQJfpu59X(2mylK^?_z8#VHyd?;EuAuoryEj;3@bDJ?*`B*zk?c(j$^*^ay^6|3K
z&5Kj+Pj_jB>ask0yYC^Xz30d>58&NL%b(k;GT-nR%a+$(Xqyy#;o653J+9%@G>?}|
z9ZWgi+fSqM@y0SYv@6b`ZKxNUrQMeG+t)P(9q(HPHs%%w`5j5o|NIGR-7+r9qD|3&
z_VKZ7V(i_ijrZ~4j>Gg<o#O&HfZ9a*$5G;J0;eoj-xktf8qJYf6o8=UI9K=gG8rdK
zJ#y@M)OUET1lxRgG~b=l&a{?5rKWnDv7)(k)(IYBMAYLpzPy(XmtboME1`w5k&$dM
zlC$69&P`Mmz_&6SS{ihvbaTI=&9@}<``(%qg)@y-6Lp<(uEVy9GU%wIf@dt2;`Chc
zDIAO3WH`g3I<)1cX<X-U=!eikoSfv`zGt)(Y@uXPC~NU7Vpr$|$2FxbJ>o;m=Q2M7
z`RAn4*>hUoo7;msJmkepykaT-m6kiu*!yR8|1VGr8G*UXJXgYkqGsfxf&io_Nfp18
z*&VnA|16W0md0tmI15%PCp=Fc1WPBVk4b)6LvZbBh4_Yf5xDOz;=qqlx5pNv&&uD)
zt)U<LixM|_?qDBtmaP<>@-RU*-^2Zk43OLQBZ)gzK??#%&<^xiwnkWQ#~8sAZ;HL#
zSVvu<3YL__zZVP|@hSaa0i~_s7ToIk%}N|6C`@}48QeO?{>n^oc{OoA{S5z`J-c_c
z_|R!U&j8{F(hpRynQ3?}xa>YtprYIJt>RP}30jL(pM5Z?QI>;U#>HE_D{P$OG&G2W
zhyj-~8^02uppJ!Mz+2Lif%)Ge8u{NxG&M&@J5hHxw|}J*wKbPnNsJfHl<GyA0az3m
z2N)SSGJ2!}Kv+{gh7(*G-i(P8kZ*QuaGKjDG%4OJuj@pDI8f?P-f;yt!EIEII1ra8
zL~65utN5TQ3U+Yzh@$Y><MzpSgU9muBv<Ga%n8e#5F89$WU-;pUUBdf^@_jiEbI?H
zkxhN;A?MBSQxM@jsmMi)#Dg9#G;s#5nVtK#Yn8`-OD-vpP0b{}6eJa}PeIWF3ma%S
z@=*duEhjz%?fxIfel}}`Gg6mm#iO^+*m4{1LcOdV!$G!@vZ%p6(WLmV#u=>0)IJ1E
zJ}bZ67YpwPfA6@E2-0p`2JWoM6+>N=L*OeQftf-{I;$BSy?Wima_G7G9cVnhw4<-b
zf6wW^45pe+r3k*s7Gqp@BM%x`4$w&diq$66;HRP)O`jqLN1c9@Bs|K%(J<gU7#JfW
zS&CqW4zMJNMkq`OB0yrv;4<0-vDIgB!sEo`b=htojpwYKQxO|_eB{%$j!;I~cY-2z
z8kN{KO2Cxjw%p`TfoQ-WWku(<oA=RES7)ou<WY+?cl}<ns^LE6EV8+|k~}X`{q=S}
zWzinEPzq!E$fgIscT=(wm6Cpw{G3l0G*rcG8m1i}i6EV|?T4sNxBw}+{=sAuN|2fd
zKi{{k3`T8iou}+H6Cv5`etg~h<A8&EcF9eU*l|z(sxrG9fz3v~;J0#cHQZAk&Dw8g
zjAl!Ds=aywRuS?C6<<{WPZnwljl?BojI=%jxcvL;=no$bM60!%1@~o?D)Z-eaQZ|p
z@u>I%`MswHwo&|$XGipxZJR8rMZHB%wua9}PjLKPn}VlE29J>I(8S=hKrnn_PeVn~
z#m$BD(USnhDg^Q>@5y&lOZX<2`-_r=K80BSWYke)(Z7Q%)CiiETrSKsWVI?@+=h)@
z>nLca_c)Ez@P=-j??aNa)msTN$As&k(N%QbH&|cnU()v-rc;sqB0=dJ%$-Fdk*F4!
z=q4D(GnN;nsx`ns$Kp(Q)ha{XQXg1*wB-wpuX|0Sb#KzwQ@Q$`?zVljE5=2V7<J~H
zb<5eRmPTDC0);ol-B<KAkh3KIv9$HuQD2K1Hxe7WqK#!6UeyCF(+2+ME7VS$&y@md
zRr-3*6)i%*v=ZMj7Y5jAbDj`9+JX(0)jk{Q`05+sjP1-GcQNyCTa=iC(g?i95Z#C0
z?SAssUc0}jXs^9s|MG8~Hg~_+x8l|Z>UaPCvnHkb&;D&<>>}diWM}U7-zAF{tdZK>
zoS@~WTQ+a)G#n!>F$@IKj|F)O!W5*!6qzz0<kKwaofP1S>D=&OO!i+Y+>6yKwVJoF
zxSE2q16z&M>m01+=;nKB)GO6j9z0#GAF^*P5@c}H(mLO5bRFcpJJs%XJ$<*|gDfB`
z-gr+Q#vlio@8s!S#Jm}u0^M1kS1W~_+7c=ngyiUDY-lJPOJ`>4QhiZ#mGUk+=yJC;
z#JYjUU!zISuoRkg@8g5mXPp3w3h19Kst)4Fk6l5SKHR|<dmJCr?#xQ6DwJ5zenJ(}
zcLt?7Fz>Al`b^;8MOw?vUOwFHhczR*&;1xzm*<FPT<n-%q}W9CNad31e=+h5ljYeY
zjDcJsUl%UZbd0@w*Cj$#+E&u_pjP!&*Zo|Ss@lfdeXb#VkMW26+&CTKV3O+L6;!2<
z+s3jIgO1jwvC6?c*h`*}4_RWf)jk}Ru6miO=5VyURHK?T8G1PYx5+%7D7hrKv#K9o
z-8$piw<{ZWz^zrX4FHun_YmUaSJfhh+~UOt)=t2@8xr0*g}#m+65~DiqR^lcFUfAj
zpe6C{3ALne`HT$*$vSaP!A`eA88?~T+~d14k61Am*lC*tyZju4@%Wy6Gp49dlVsx&
z4i#k4_)9biekKL_Bh%&Wu?VY)1k`x`4n_vwE@pWn9-$&N%hKefr{p`M6TJMIDXW|)
zULUsrPh@`RNJ1{1_+-|AJXPdMw}jy{c*tx(F5TX_y4<}4^oq+qTz=WS6)PjCBX=p$
ziCKo48v7N=HpCU2wsPV0NE3oaO!$~gNq;1gfeB5qLZOdM;DRu1^m<*3W^APHq%^ex
zFPDJC3Di#6w<v>DArNMrm^z+NM0(R{E1I$yS!vC;e5U;!IpyPUwaf6V(ZpHv*|~B0
zGJrRG0)&qsuVi5bv2lV4&-zKM0iz$!wzoV?<0EaS+z|F$RE}Vpn2#;%J>ZyP*yyK6
zpV}9R{;UeoF28&d77F*<Es^*<-9n;EaEdxFz!XMFoh-D(qG5hBNEm4arE!2|wI{gA
zx{Pg^rUEpCa-_}qB*rJjLU!0rb~2xDMP_fUj94Cx14L2ih9FrIB_u;Y$3yFvkJ(Kz
z^Ym_5sve`xVEJ{D_*Udk&8oMgB<V5SP4W@*I3@g2g|0{Zfz$)#*AMd^5n`;)cbx^(
z-`F+HrjU<(!~ByXr^H6>U>+~7C8M3z#IXa-RmT&G8GkS${%D^22%4=rn?_=uOga&U
zr!S7p-bP7pCoRP}LuZW(+bX*|*au2uQ)EbH<kQ~eM*<@Y1NulnDCzs&cLPsYD`Soz
zEb_S14=RuDT6MsQ&Xc5m!6{BsU=<VY_E>56o7kPwPu_mUE%b${X1M1p>%ROWKzq!m
zUP}lGvHChi;%FvBLR+`oqp6;$LnsllAia2lL5G>cR5mIEolawZi6vc*_ArMqsIgf#
z!t_Dg8A!ssMHJN5JNt+b1ZnT?<^m`w$1-*ciu|(r9$C+iv<1_G)X}ByIF==EN$1D{
zA`0V^{e$kC&V4grUg)EV@_tD37@3t&7rm5q6M@MS$ugIlOPJt2EXgI)J>!`)c?O;>
z%i-ne!~F;yB6LZXM4oog;+;X~wN)O*{?4J`f9DBKWO9otvuVCZClKDG&a|>H>>W@z
zjebpW-KZd&9A2ZmnOkR}bG`w;gdG}}ykB_@V2Jc7UZT+qJ!8ic08R#p3bF5F9!w|>
z%};H?<NZjbNVCV{8&Q!cPA%%4TEKrYm_Nj<{}@SOr6p0k@zw2T`5awW%yqY$w!7^+
zd$GB`<(u{}b)fBW<w^!VR!f!MqS~4U=D8%9Pmz4m(JgL1uC?kBVjxhrND3KZc^AjN
zTZwtJN`bmdCP3}*6=lP^&#72w5to;KrpOcAryn2S^Km_;|NFW^;c_CvWtT5kw(JIB
ziuBpFR3cjWwP2qna)j7c14n!}WS0*Gm{N`-97jLPny+&n@_?A2I2`UC8rtg4(IlRq
zTrP>36GZ^PFK%2;RlVYxHnBKQsd#dW&*}wgJXH*(ejOX{xhKhp=Y3$2qAYI7jL?=k
znnsRG|JqCSbU=bt9RMT9PZ_0As-%1Rum@nJz!Bc3T*wsm&cR}SF+uO!Vf4*#n!G7r
zA@?L!At_sM`()@2Y~gYDRvTQ{oSD(R80>8&?9G<~?t;@F?hT0?VeHBnC6;;4SeB+h
zTK4eN{4t;dYz-|srh*1HHczTDdMvXn5G*s0MscSfLMeM&xI~YQUt`Bv1#`tO2*quL
zX1uL;1l_x#FVSej7@y-yu(Dbyo}zKmz5+}dPJA5Dy<xy9%qhLZnUolbo~+$B!YMQ<
zf6!?dI<<f1$hWAEJ;6PkRl94w^fsNB4lUmGp-#|dw=|_r6D^eS5Yt($92s3-gzHtu
z4;%z+-PY~IZ@o_KOt$Z+zGjmC(Dvv{6__Wx;hgYr>Tr*OVdT#t;?bK{BDXNHuGWfb
z@T7vla)BaZHR&xd>J&G7u5Cn}DtXs=I0*;7iTvC5eOKugC7<D8X7<iv!Vu#l4lxbl
z)CyW9`lmui;q&_jFzd_n^NanI<r5PtTXnW1$j>bCl^%ZDbZWtQL7&t>FO+vC9W5$X
z!n154M+Bp#Lw-lYt_KS!BEgBoay!;<t#?l$O}aOWPK8CWl=d%AnXS}I4L4MJC3^BA
zQnzp-=c4tMZQ%Z_jNK0na42CYJPjS`npRpIiB|gnT|4DPnM<c_Dlo-ive|1*w`0?L
zP_`O=^@z5VKgQsQRmLzEU|sGk#-#4eA#DkA(kf<}OTrEY4|Q<_4-T5VWst(TSiy&T
z7+1zNKUW;_bAk#Yk4R%N7Yu{8##jOVrD~3w#Ap-aNoHFL`GB|WqZrziU%v#sR~me@
z)7f_2AnJ|_)fSVdIVwlV1+OG!bzgR&K>!PzUIczh&GAKeX1vtTJjGfRKN6zBnD#kr
z49R}hE~Ois%5xr>gGh<zpv$nWI?s?*j4WTGSEVgtif1b?&Vq~BJ6~E2a?xQxm(?8U
zR}j<mI8Y5`ePT}j_YeF=lG%xq`|uLD*do~y%}3G*$$(2mK)1LW8LXMH6a~h63HP7}
zx$dZ1rMt^rL{lrx)%rWxw(f<Zc&9Li$MQj;ok|eA={RTJl7glo8Fs2eujoAT(anqk
zzzEB@l6{41DWpPjZ3w`)i@r+AC(E~sBGWJ`@B*TEY_04<e#FdFJpafP7bGZ?V|}!R
zgdysy&dbzbG}SJZ%A~z-L|;qkCUCTA@EL785_BdgkEIK^(}7q5!tXrvj$?h0rWr$x
z_rZr2c6Po;Mewo~;4jS90zSOXc;wB0HgzZR(j4kpMV@d65}$ioC=sTFY}J|Qi95>L
zr*@*Fo?OFiqSoChYmU+I>67bnAhgOzPR->G&5QhdIu_s~1(y2=<cuoF5rm}=szy32
zjcz2gund|kuxttY=2j#-M!FzTU?%Uq+qd=oTjC&!!uClyuxXbO%+@y8_Xw2vAx2;B
ztT3&65%qf!rinkBD>r1%Eqs(q<>RfRxc^LU)DKt>RVOs=xkx&}1Bnv0C+}&rKLq;Q
z@|j?qc|(7{5r?=0Euj^IZJNMmaf}`=qUHIHyqUtkacM*`zYt*}e^!OGU4bk}D}(UG
zmB<0VpR#f~v-VO~`mJQcN+mkm^}G`Z+mLU!CUeB^bnD%H1Y1WEu=1BsLZhtp1?Q;A
zHo>J@c+VVS-uJ#FpQd?xQh_r=7_R)#5+yz?%WHwg_D}%-?5#la<7!hGyoyr42Vjx!
zu(+UckMzilk^{Qujx(lKZCvGT9GW{y04=<FkmG!1=b)y0s9wC&Xvs6;8M3p{%3!&;
zVymOmY&!2QKnQs{$BYp&fPln63zhnMFAW#gA<{H-(@E^1@*>U!R^lJZ$TRh>_7+3z
z3l0MHxlA<c@>jb0@K9D;yWEVCvoqXtJ_P$#JHyIf2<-8AD%uI(jqGUL%w(;7o5^rw
z&M}Xx21#E*EmcKqS9kbQjil5;UAUNyS{jpliZDFw9+XUdutHTm(W0nBxX6psk7TQ3
zpGd6@O@mUZR8QZKXyVM<;l=k%q9BAtsf9@SP3%^jdixOGX-amn1ddY&qFHU0Ku7MY
z6|A>4ZFMnT<kW~8?eaKISBlM%<dl6OlusJo5iM_6P9c?8x_(I?+Gx}4>@|8j#Ic%)
zJ8d?|PsKjM7q;uF#WUmkUR$pTr28`X2cB=>$iu-wDM355hqQ6VMET*MvEyC_3YxvH
zH4wMXW`v=2NMTy>EAag>hSP0WcDL;9bXy>rrsRCfM~&NVKX<-0gi!$<k(<9I4;(%C
z@H<>DMgrG9aj)@LWx~b<9s;r~Fgu$Os}xE{+@SU~@DKRs%`&)4uN?|k>WkrD&jLfS
zs)h^vpS0^0^7*D4aaG85VnDVS-70DGs|nECoW>foe-_ttY`aZjx%AiEo|TMO7lSwT
z|J-DX)GgmgP(Aj+nO#WKIQIFLSBcGxdJr|6lYPzIS^Ui{<sqR9piBiEH(pT1VU`&y
zHl0|}f2_M{(WPl@H4Dr+JE$(M!QQ#%Gi}kFUh31t6TDwOXClh94IW}DbkH@)1>cWa
z=}vr6GHj2ficRyg{C1KRvg_FeouF+Eu_h7FAUr0wb4ct>;1J>dN$NAJP#}VhjHvUV
zM@>&)Ji+`=ZBd2h+*3N|=Q)x#T)o%R5f+$N(u**qhg6h+4-uWd(XC1HQOOEXy%mEw
z>4Vx?C3&ZED<{U;K7jbyYLO{!T><S5ZEJVSFFdA!uKY`<C)^!3Qx=Lb*OzNN@2rE*
zM|UpzXrW6L;cV>kDLyHo7mh0AY-()l)iva15#j44$9jRRo7NLJq<@}8XL`g{-^306
zE<ux65V-%-4Z&Wx&OtmbC%Tt6b)xX<h-?``sx$6WfhU)~+-?3^5DTGjpkUCHFW!$v
zt6Zr^w7wtetyg?n7of{Rh0hQ_4&K)>AJToAp34gJK+p&0so7I$kBR+^_{iO!Lw^Wm
zAkKA(>&EUmt8rSa>xI5HnmKJC)^efIo=qGib32p$q}wz(qu-f(y01A!l=tpVV0n;u
z+V6>W&9Q#k<12*E6k7-sgGAG;iYzj&u~#hx22h&~fzh0QR+@2!UUCwQFqxvy3AzTZ
zF^YwtH@N^pfN%Gi`eiT<T;(<SD})2dt*#!E6ZnVPy+RN}+&C@>ee-y9mB%})s^QQR
zpcm&LK-wRSxPNFn!#&XAf*=RD6z7lE<OI7XY`{l6NlnogKx!T!KZ}7Uw7>YY%DSOM
z*nT&D&rDcbH{^RC>F}Cx2@UGS3BEFzDO4aER?6p8_AG1zuZi<vtncbh92D&_!t3kj
z>6X0<8NRlL8Z+WO?1PI0(3++3t4;f6aJ^Tp5f2BJZJ*9NoexJggK2j<Ya$^vC*pw9
zeMxb$mNey_Y&cy3+}H{AYS(0c8#l{c`bGhye3_tZvr{&W4=YR?qA~s%)?RIEMQ_0e
zwiBXw$Ums>Ubeg4{oLOb)Q~3M9YtyPf=(ooUr-=+W#?pkM_~b?=>wv51kCJQd*(Zx
z&zTDdPG=y{0+H@Dbop*2)P=bvZR~p9&M^-8dY+O*wNjo;d1TZgn-hy%cb~4g_A7O*
zUL6EGFdyB);5;td-g(V}yyDz#HbrJ(pKSxHDV&d+3LKWcWHL5I2r$6We!kf8ZKh`b
zV97GtEd3~>hM&OBKB0@|VpAT%MFG{gngNrtrdadi3HUid7oGg{#4jWl7*Lp}kg%(e
zNI@S4@f`i^*2ZVbEbnQVcF-e5bXyy9b+hW~3cpP-$q2wJoCv(So;{+{5ul)IKDg+Y
zkw0)oqyF)QY9vS8!)YZkh0FI$De-5l%xE*L|HX*(o%ke)wjlJA57CEfNHvp3Wv1>x
zj0ZA8SU`pp^DLYXq|BZAanVAcUG41T5y+ajBgo`>krd0P*!8{&&m%vdSizFpCDAjo
zaKTN2hq$5qY;oc%wTDp4DZ@alT(V1{o%?H^T=9S%N}S4K<~xiB=-Rx1E9-0Gn*zkC
z)Xt#pZP!EF?xgOm%BdmBL`UIiXRhVPrBQIZe#((i#fI!$Q|O-H8xZ;@&dMhu%X8|J
z-JZf%=J`9@i3Tm6mF-OeAm@S3<#cW@6Oi;kH)gj!C7pl51tYd)OoR{nj5;p>t%DIb
zRlD^eg(}D7!=>6+DyBNU$Q!sEi?$$mM$dvS?4MyqJB*U*_4Y9MEf<amc4`cs=jc$J
zHFZ_H)QEO^_T@XJfdib!5U+m0(Np%ALX5>Y6LknMey~1?UQ9yZovL1RC}%wWL^M1h
zz&pq(b77$K`Xn<LWo;qwj`D?2=~9L_#BdM}aZw9An;$;OH<RvOy=r)WBlD-H$(}7u
zOJF>I7}8?~75GI7!i=6viAi2xbZ{s_I=^^G+0(4t4wpE~#mc-c6li)3;7aRIe$u<K
zPv0&s%6$=P%a><EviRH_&M+4Hex%@}^F$=;j!$c{4!Mut8uBqx2lW1{Bt_uDJ!0Yf
z8ik`(ED%f{@0;(e__)yNZc9WSn=%BFVQdKr4D85w_-0z<fJX2qf*;d3nO|KIZt-j#
zIMhIihXUAEKi-3H^%K7!|LX7c8V-O*y^V?qDE_zp9>?GJ_cW~?%p5&kRm?4|UEN%~
zDOBBD%#H0;%#F?dIiXBe`JsTWj3Us&XxG7j0Tjs_woG0tsM>5nc}0=SP?HA%KAAJE
zWH#t{WUf^o+MYwaB=jUm%K$DweQ|Po-@7_$3eOItjZZwMrL$X3tU3w_1whtCVIsmp
ztsozJEZUt9JDjH+oJ97ndvs;=5IekY$Cv!vv2B3?)7?VqB@cn8f)G-Bhp%v9u(rNT
zX&6m<KZA%HPCvTy;IU-;sX$>n@;dwxf!xx-rPaWX&xss0uETTg=jtJ9f7uddZv|V?
z{8PqMym(I#0u;<_Qw1Ir?&X@2yV-OuXn!0iqIDZS=TwM6xZRhZ1GDq%F)*L*6vS9|
z>AK(gZbYq@1coIA`b#q^dqS86{%CBhxJ~?onk>b}307`LUwZ)-WlB|f*2$FLdB7#~
z%nz4RqvKW>bkzy3>HuljK{?eu?&9n&ev`s7bP4t<uc71F3%a15G^sq-sYloWWBdGx
z!#9<o)SbAu+2tRt#6qhj#b+`!_I&3F{WK{?bfFwfKadjMXX`@w%{oHHc%8_`JsH9=
z%3?qjo_LdK*`Bjt<cC8eG`?!2&M+MV3*xn|L(#e8z>C*{2w1CSF3s{1e-zHT@={w7
zGG+JD_=((nfn_2j*VN&be31r?iW?`zTw(AN8=mz{caY>A!TExd=dq&})g%rI?)(86
zgS@b6hI)4;O-o<^#ojfH(;~nS6YWf~hnP%X+iGVSl`@z&t<alF{a*WvZ`2952-f>v
zh$ZL9v?5OyNObndiKgSF$fF`!3(y7FYUu$-qj--`Wa$q<f++%&5@}RRHff5}KIlN!
z1M@j>5$OVZh5&xm0?jpSb)G_W^i<$xOoOL$tcE`6>X2Ab0O+rSPR?Yk5&p*1P<R_w
z{WW_3vyn~n|8>y+(aH`}(^o~;#PLT8JxQnuL>(xzN3}+z5tk@O2?dkL9F0Ij2(vMl
zK{6&i8C;7FJMy#iS;(9yW6w5lS-By58&)~;&3=3#lX}dOClKCdX?!P`b1QIm;5yM$
z`}%<2>wbrK48cptm3tluIje{<mXNKV=wR}>!F9rOJ!?!i=gh$t2DYgxb5gEi@qXZB
zw0-OWY^!agLvaQOHeK##yzI%ymy5y8y0w_&xa>d3kW>@{MTGOo?kh2BS*)iegeba#
zf}~O`Iusr%s#Q*d9gpg=Ui@iin@Zg1Tf+n%ceeRkH(dA=$5-^j3|>LE!RbR;cI*KX
zCwhOtOri9xGEFdNlP$Mj84_lC5c_-9mf)tV7o9j=*&!Y#w8^4yWXR<W0XBmMIG&^9
zJMO9D_nZ7oWq59IO>;2ye1(8^1m9rAqY(zI;%xN8>S7;=3SJ-`x-<CNA?lQ0DH(=U
z^n%<i+ymemE^9S)JlSqzISC4_l@4VD*b`Znhm2R=CquYUelY4gG@Ibo!soV%f<icY
z7Z^0@^szcgmyO=(C{6CPLqWsGK&3yf_XwmVYrxCeUA>)+YX}Oc*<UAoQq5qF4HRUQ
zacv}vF@ngo#SutSnX3t6je-ZT7K0xwwzgOkat>coT!bAj6!oTi$z#qnh^(s18p35Q
zYgUM>CI^^r8cZR7QI_!k(r69No<^DGZnx27r}Dh|`9ZEK-9e|J$U}pwBlTN6G}L|^
z*3__n8%M_j5ngf9sTepe!?}T1F=nl7@F%Zhfg(ddT@e`q>T=X3YWLiE8te~xMF(^9
z=@x>O-o#BbZ0|I4mPY)mnsiFOYcS^e8Il#QT}~-Yw(>Y{Mf)a`VpxDq;ZD(`?39Iu
zPld-$a*XPw_Pe0)JP<SO$R4tNwP@kF9gG1kd#p-DS&AP?t5uz*<?`S8Vx@B%NR5i@
zblcG(XRnG%gHS1B0s`BST;e#99GpR`AU8~c8m)xW8VB_W-CjfmJ`f0zBy2Kpb6ubG
z-3cgJZ{r~KN&;K~bZ}OmWhPj~ohw|lo<!8BZz|Ke^(4Oo0g{swCwcD32iS$gKMFz)
zzpyclKYjQL>JhDlTyG^5u^w3$l_{1lfWUN0+J*z4?EDTJy`z==8;UIrIS0nNNB{%D
z+}AXppo!7rZake-v9I7d467x{tcHUNvwT*yL?6Oly{|Tqu5lmk_D3BNT9AZxcz863
zi&9CSdv7a{y5t&StqmlgADmISSjM~&xZ?Xjh@2*jU}C-LQ)#t_?0qL!Uce<U$eaDi
zUb1d?AZP9%kwaXn8$L0>{_Gd7V+(PaS2hi+<i%<t(ylo^a;<E~>j!g*gPGpow%^s(
z*>jJcVe#YqT;Lg<Bf2OYM9pdah<B}NH9vI&$4Fpks@DHLT%=}aYYP9N;-KMD#L5eU
z%nVxJLut3l>O83j`Z?fNTtZgOED(K*NnOyt;u0tr2FPFRtlycjzbMTAE`LX8{uAMM
z0_MLX^uJM%{)O-_(xs~8p9sG*+<p-?|B{@yvEctic%yCpf`9}0&s4a-AOhZ|ivNQ6
z2Qlt1)jwnN+e`XQD&AE8L6rN?8vpnS|5O_LZ;gKv=l;_BJL=p&wLn0w|4r{VBHh0m
z>vwL~FDl(%LiuLezZiS}0{GvEb$?pncbdg7de~o5^G3Y*8}R>07W)(O_sQ-re#T!C
zi1@dVf3h`x2mEEL-%ClVztG-RMyUT0@Q?BEpP0XA?O#RcUn2bW8vf>g|KBC)pO5(6
m0e_|czl8Sf_WypwKZ*e*AmrOI0RcgLyE@(+<1@pryZ;Aut`v^|

delta 729
zcmbP~IG4LVz?+#xgn@y9gTZfAt7F!cCFzww-b^3{iTb*RIO=-(x#{~l`gyv!28ZbR
zx_$ONbK1vSSMMUPx31Q?Gv_x48C)@b@U-ZRvrwUqhtD~WP=+o>)w7P5&bhAaR9&gL
z%WtZ~R|mnnD$dHRy$>$gu--rOWYM2TryfnZawo}>_57X`Ti-an<(JOP5!w({pPnA4
zw__)pfu{I^M2B@N_br^bZ(`#@L49$3aR!K6Ie>2UU)4JK0;6g@_c@>Q-a4APURO~a
z!}YDe<VxvDAAg`Tzk=M`Y+&@cMAqA@%V@HfcTo3Q5v|_MXHRuG|Gl#%R_n}WnZG>V
zpXV|)Uz!xWDkisb=bY{!Veg>elDS%rZL?lV9+8%Ou}n=XgJt?N%^zuM;!nlH#ilQL
zCZ?@j@l5q~X43X46IA!a0NuyVab>owa4#_A4g)cYdpECUwq~mTW50I!>SwzQo}cTl
zR@&EY?5L}J=lx^%XIo!RS6TdHzFfxTs>+|-=kM(2Hcbz?`C5NZQk1l9>L;(2+5Y9T
zUZ2{#QRJKMX`7EvmwZ2c^l~t(&DAAB%kG(d&8^+2w9s;@?yK}C>o3H8UXm>RSw1hg
z=)#?&+dt(W%W>atZQdWMHv5U1-HZ#W&pzi{g5A1etI?XdObiUynIUfF0=k(29JW1d
z3KEP=BH%QDo-!ui)-h24Mt~!-S3!vd0ai0iF4Ps#3w8_ehL{44Ge=|_MG@+OtSUyJ
n7G+nExya(23@k|8C?E%(B>$ZPxtf&?B+mkbOpFW+tzgvv%(VqU

diff --git a/Workspace/Siman/WebContent/js/popup.js b/Workspace/Siman/WebContent/js/popup.js
index 7c3767d..5acc0ea 100644
--- a/Workspace/Siman/WebContent/js/popup.js
+++ b/Workspace/Siman/WebContent/js/popup.js
@@ -100,9 +100,3 @@
       }
       return true;
     }
-
-////  For making easier on the eyes and fingers
-//    function $(id) {
-////  --------------
-//      return document.getElementById(id);
-//    }
\ No newline at end of file
diff --git a/Workspace/Siman/WebContent/jsp/editContext.jsp b/Workspace/Siman/WebContent/jsp/editContext.jsp
index 983161d..273d7b8 100644
--- a/Workspace/Siman/WebContent/jsp/editContext.jsp
+++ b/Workspace/Siman/WebContent/jsp/editContext.jsp
@@ -3,13 +3,11 @@
 %>
 <%@ taglib prefix="s" uri="/struts-tags"
 %>
-<s:set var="todo"><%=request.getParameter("action")%></s:set>
-<s:set var="type"><%=request.getParameter("type")%></s:set>
 <s:url id="undo" namespace="/study" action="step-study"></s:url>
 
 <!-- Selection of an existing type of simulation context
   -->
-<s:if test="%{#todo == 'selectContext'}">
+<s:if test="%{action == 'selectContext'}">
   <table cellpadding=0 cellspacing=0 border=0 class=text>
     <tr height=2><td></td></tr>
   <s:iterator value="simulationContexts">
@@ -82,7 +80,7 @@
 <!-- Input of a new type of simulation context
 -->
   <table cellpadding=0 cellspacing=0 border=0 class=text>
-    <s:if test="%{#todo == 'newContext'}">
+    <s:if test="%{action == 'newContext'}">
     <tr height=18>
       <td width=18 align=center>
         <s:a href="%{undo}"><img src="<s:url value="/skin/icon.undo.png"/>" border="none" title="<s:text name="tooltip.cancel"/>" /></s:a>
@@ -99,7 +97,7 @@
 
 <!-- Input of a value of the selected simulation context type
   -->
-    <s:elseif test="%{#todo == 'setContext'}">
+    <s:elseif test="%{action == 'setContext'}">
     <tr height=18>
       <td width=18 align=center>
         <s:a href="%{undo}"><img src="<s:url value="/skin/icon.undo.png"/>" border="none" title="<s:text name="tooltip.cancel"/>" /></s:a>
@@ -121,7 +119,7 @@
           </select>
         </td>
         <td id=enter style="display: none">
-          <input type=hidden name=contextType value="<s:property value="%{#type}"/>">
+          <input type=hidden name=contextType value="<s:property value="index"/>">
           <input type=text  name=contextValue>
         </td>
               <td>
@@ -132,7 +130,7 @@
       </s:if>
       <s:else>
         <td>
-          <input type=hidden name=contextType value="<s:property value="%{#type}"/>">
+          <input type=hidden name=contextType value="<s:property value="index"/>">
           <input type=hidden name=contextValue value="0">
           <input type=text   name=contextValue>
         </td>
diff --git a/Workspace/Siman/WebContent/jsp/readKnowledge.jsp b/Workspace/Siman/WebContent/jsp/readKnowledge.jsp
index 0a74809..a1d402d 100644
--- a/Workspace/Siman/WebContent/jsp/readKnowledge.jsp
+++ b/Workspace/Siman/WebContent/jsp/readKnowledge.jsp
@@ -113,7 +113,7 @@
     <s:set var="knowledge"><%=type.getIndex().toString()%></s:set>
     <tr height=20 valign=bottom>
       <td>
-        <s:a href="%{addknowledge}?knowledgeType=%{#knowledge}">
+        <s:a href="%{addknowledge}?action=addKnowledge&index=%{#knowledge}">
           <img src="<s:url value="/skin/icon.add.png"/>" onMouseOver=this.src="<s:url value="/skin/icon.addhot.png"/>" onMouseOut=this.src="<s:url value="/skin/icon.add.png"/>" border="none" title="<s:text name="tooltip.addknowledge"/>" />
         </s:a>
       </td>
diff --git a/Workspace/Siman/WebContent/study/displayStudy.jsp b/Workspace/Siman/WebContent/study/displayStudy.jsp
deleted file mode 100644
index 753263b..0000000
--- a/Workspace/Siman/WebContent/study/displayStudy.jsp
+++ /dev/null
@@ -1,235 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"
-%>
-<%@
-    taglib prefix="s" uri="/struts-tags"
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
-<!-- Initialization of the edit action, if any
-     =============================================================================================================================
-  -->
-<%  String              action = request.getParameter("action");   
-    String              type   = request.getParameter("index");
-    if (action == null) action = "display";
-%>
-<s:set var="todo"><%=action%></s:set>
-<html>
-
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
-    <link href="<s:url value="/skin/default.css"/>" rel="stylesheet" type="text/css">
-    <link href="<s:url value="/rtef/rte.css"/>" rel="stylesheet" type="text/css">
-    <script language="JavaScript" type="text/javascript" src="<s:url value="/rtef/lang/fr.js"/>"></script>
-    <script language="JavaScript" type="text/javascript" src="<s:url value="/rtef/richtext.js"/>"></script>
-    <script language="JavaScript" type="text/javascript" src="<s:url value="/rtef/xhtml.js"/>"></script>
-    <script language="JavaScript" type="text/javascript" src="<s:url value="/js/popup.js"/>"></script>
-    <script language="JavaScript" type="text/javascript" src="<s:url value="/js/action.js"/>"></script>
-
-    <script language="JavaScript">
-    
-    initTextEditor();
-
-    var substitutions = new Array (
-      new RegExp("[\r\n]",'g'),   " ",                // For removing carriage returns & line feeds
-      new RegExp("<p>&nbsp;"),    "<p>",              // For removing &nbsp; of the 1st paragraph
-      new RegExp("&nbsp;</p>"),   "</p>",             // For removing &nbsp; of the 1st paragraph
-      
-      new RegExp("&eacute;",'g'), "é",
-      new RegExp("&egrave;",'g'), "è",
-      new RegExp("&ecirc;",'g'),  "ê",
-      new RegExp("&euml;",'g'),   "ë",
-      new RegExp("&agrave;",'g'), "à",
-      new RegExp("&acirc;",'g'),  "â",
-      new RegExp("&icirc;",'g'),  "î",
-      new RegExp("&iuml;",'g'),   "ï",
-      new RegExp("&ocirc;",'g'),  "ô",
-      new RegExp("&ugrave;",'g'), "ù",
-      new RegExp("&ucirc;",'g'),  "û",
-      new RegExp("&uuml;",'g'),   "ü",
-      
-      new RegExp("&ccedil;",'g'), "ç"
-    );
-    
-    function initialize (action) {
-//  ----------------------------
-      if (action == "setContext") {
-    	  edit.elements[2].focus();
-      } else
-      if (action == "renameDocument") {
-        edoc.documentTitle.focus();
-      } else
-      if (action == "renameKnowledge") {
-        edit.knowledgeTitle.focus();
-      } else
-      if (action == "addKnowledge") {
-        edit.elements[1].focus();
-      } else
-      if (action != "display") {
-    	  edit.elements[0].focus();
-      }
-    }
-    function setValue () {
-//  -------------------
-      var select = edit.elements[0].value;  // contextValue select input
-      if (select == "0") {                  // Creation of a new context type
-        tds = document.getElementById("select");
-        tde = document.getElementById("enter");
-        tds.style.display = "none";         // Hides the select input
-        tde.style.display = "block";        // Displays the text input
-      }
-      edit.elements[2].focus();
-    }
-    function clean (html) {
-//  ---------------------     
-      html = trim(html);
-      for (i=0; i<substitutions.length; i = i+2) {
-        html = html.replace(substitutions[i], substitutions[i+1]);
-      }
-      return html;
-    }
-    function submitEdit () {
-//  ----------------------     
-      updateRTEs();   // Sets the value of knowledgeValue input    
-      edit.knowledgeValue.value = clean(edit.knowledgeValue.value);
-      edit.submit();
-    }
-    </script>
-  </head>
-
-  <body onLoad="initialize('<%=action%>')">
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-
-<!-- Title-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/titlebar.jsp" />
-
-<!-- Left pane
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />          
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-      <jsp:include page="/jsp/studyProperties.jsp" />
-    </div>
-
-    <div id=main-pane>
-
-<!-- Description and simulation context sections
-     =============================================================================================================================
-
-     Display of tabs
-  -->
-      <div id="tab-bar">
-      <div id="tab-description">
-          <span id="tab-front">&nbsp;&nbsp;<s:text name="title.description"/>&nbsp;&nbsp;</span>
-      </div>
-      <div id="tab-context">
-          <span id="tab-front">&nbsp;&nbsp;<s:text name="title.context"/>&nbsp;&nbsp;</span>
-      </div>
-      </div>
-
-<!-- Display of contents
-  -->
-      <div id="article-box">
-        <table width=100% border=0 cellspacing=0 cellpadding=0>
-          <tr valign=top>
-          <td width=38%>     <!-- Must conform to the width of above tab-description -->
-            <div id="top-spacer"></div>
-            <div id=article-body class=text>
-              <jsp:include page="/jsp/readDescription.jsp">
-                <jsp:param name="entity" value="study" />
-              </jsp:include>
-            </div>
-          </td>
-          <td width=1></td>    <!-- Trick for aligning the vertical separator with the tab -->
-          <td width=1 bgcolor=#AAAAAA></td>
-          <td>
-            <div id="top-spacer"></div>
-            <div id="article-body">
-              <s:if test="%{#todo == 'newContext' || #todo == 'selectContext' || #todo == 'setContext'}">
-                <form name="edit" action="<%=action%>?selection=<s:property value="selection"/>" method="post">
-                  <jsp:include page="/jsp/editContext.jsp">
-                    <jsp:param name="action" value="<%=action%>" />
-                    <jsp:param name="type"   value="<%=type%>" />
-                  </jsp:include>
-                </form>
-              </s:if>
-              <s:else>
-                <jsp:include page="/jsp/readContext.jsp" />
-              </s:else>
-            </div>
-          </td>
-          </tr>
-        </table>
-      </div>
-
-<!-- Knowledge elements section
-     =============================================================================================================================
-  -->
-      <s:if test="knowledges != null">
-      <div id=article-box>
-        <div id=section><s:text name="title.knowledge"/></div>
-        <div id=article-body class=text>
-          <s:if test="%{#todo == 'addKnowledge' || #todo == 'renameKnowledge' || #todo == 'editKnowledge'}">
-            <form name="edit" action="setKnowledge" method="post">
-            <jsp:include page="/jsp/editKnowledge.jsp">
-              <jsp:param name="action" value="<%=action%>" />
-              <jsp:param name="index"  value="<%=type%>" />
-            </jsp:include>
-            </form>
-          </s:if>
-          <s:else>
-            <jsp:include page="/jsp/readKnowledge.jsp">
-              <jsp:param name="entity" value="study" />
-            </jsp:include>
-          </s:else>
-        </div>
-      </div>
-      </s:if>
-
-<!-- Documents section
-     =============================================================================================================================
-  -->
-      <s:if test="documents != null">
-      <div id=article-box>
-        <div id=section><s:text name="title.document"/></div>
-        <div id=article-body class=text>
-          <s:if test="%{writeAccess == 'true' && stepEnabled == 'true'}">
-            <form name="edoc" action="setDocument" method="post">
-            <jsp:include page="/jsp/editContents.jsp">
-              <jsp:param name="action" value="<%=action%>" />
-              <jsp:param name="index"  value="<%=type%>" />
-            </jsp:include>
-            </form>
-          </s:if>
-          <s:else>
-            <jsp:include page="/jsp/readContents.jsp">
-              <jsp:param name="entity" value="study" />
-            </jsp:include>
-          </s:else>
-        </div>
-      </div>
-
-<!-- Comment section
-     =============================================================================================================================
-  -->
-      <s:if test="%{writeAccess == 'true' && stepEnabled == 'true'}">
-      <div id=article-box>
-        <div id=section><s:text name="title.comment"/></div>
-        <div id=article-body class=text>
-          <jsp:include page="/jsp/readComment.jsp"/>
-        </div>
-      </div>
-      </s:if>
-      </s:if>
-
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/Workspace/Siman/WebContent/study/displayStudyStep.jsp b/Workspace/Siman/WebContent/study/displayStudyStep.jsp
index 37d5b79..8039f65 100644
--- a/Workspace/Siman/WebContent/study/displayStudyStep.jsp
+++ b/Workspace/Siman/WebContent/study/displayStudyStep.jsp
@@ -1,11 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"
-%>
-<%@
-    taglib prefix="s" uri="/struts-tags"
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
+    pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="s" uri="/struts-tags"%>
 <!-- Initialization of the edit action, if any
      =============================================================================================================================
   -->
@@ -14,9 +9,8 @@
     if (action == null) action = "display";
 %>
 <s:set var="todo"><%=action%></s:set>
-<html>
-
 	<link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
+    <link href="<s:url value="/rtef/rte.css"/>" rel="stylesheet" type="text/css">
 
     <script language="JavaScript" type="text/javascript" src="<s:url value="/rtef/lang/fr.js"/>"></script>
     <script language="JavaScript" type="text/javascript" src="<s:url value="/rtef/richtext.js"/>"></script>
@@ -92,10 +86,11 @@
       edit.knowledgeValue.value = clean(edit.knowledgeValue.value);
       edit.submit();
     }
+    $(document).ready(function (){
+        initialize('<%=action%>');
+    });
     </script>
 
-  <body onLoad="initialize('<%=action%>')">
-
 <!-- Description and simulation context sections
      =============================================================================================================================
 
@@ -130,10 +125,7 @@
             <div id="article-body">
               <s:if test="%{#todo == 'newContext' || #todo == 'selectContext' || #todo == 'setContext'}">
                 <form name="edit" action="<%=action%>?selection=<s:property value="selection"/>" method="post">
-                  <jsp:include page="/jsp/editContext.jsp">
-                    <jsp:param name="action" value="<%=action%>" />
-                    <jsp:param name="type"   value="<%=type%>" />
-                  </jsp:include>
+                  <jsp:include page="/jsp/editContext.jsp"/>
                 </form>
               </s:if>
               <s:else>
@@ -204,6 +196,3 @@
       </div>
       </s:if>
       </s:if>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/Workspace/Siman/src/org/splat/simer/AbstractDisplayAction.java b/Workspace/Siman/src/org/splat/simer/AbstractDisplayAction.java
index 15e7559..e60f604 100644
--- a/Workspace/Siman/src/org/splat/simer/AbstractDisplayAction.java
+++ b/Workspace/Siman/src/org/splat/simer/AbstractDisplayAction.java
@@ -3,6 +3,11 @@ package org.splat.simer;
 
 public abstract class AbstractDisplayAction extends Action {
 
+	/**
+	 * Serial version ID.
+	 */
+    private static final long serialVersionUID = 3003902258668626946L;
+
     /**
      * Index of the open object.
      */
@@ -11,13 +16,11 @@ public abstract class AbstractDisplayAction extends Action {
      * User activity selection.
      */
     protected  String           _selection = null;
+    /**
+     * Next action.
+     */
     protected  transient String _action    = null;
 
-	/**
-	 * Serial version ID.
-	 */
-    private static final long serialVersionUID = 3003902258668626946L;
-
 	protected enum Execute { popup, develop, reduce, reduceall }
 
 //  ==============================================================================================================================
@@ -25,20 +28,23 @@ public abstract class AbstractDisplayAction extends Action {
 //  ==============================================================================================================================
 
     public String getSelection () {
-//  -----------------------------
       return _selection;   // Equals to myobject.getSelection()
     }
 
     public void setAction (final String action) {
-//  -------------------------------------
       this._action = action;
     }
     public void setIndex (final String index) {
-//  -----------------------------------
       this._myindex = index;
     }
+	/**
+	 * Get the index.
+	 * @return the index
+	 */
+	public String getIndex() {
+		return _myindex;
+	}
     public void setSelection (final String step) {
-//  --------------------------------------
       this._selection = step;
     }    
 
diff --git a/Workspace/Siman/src/org/splat/simer/EditKnowledgeElementAction.java b/Workspace/Siman/src/org/splat/simer/EditKnowledgeElementAction.java
index 76a15f5..cfcb2c5 100644
--- a/Workspace/Siman/src/org/splat/simer/EditKnowledgeElementAction.java
+++ b/Workspace/Siman/src/org/splat/simer/EditKnowledgeElementAction.java
@@ -1,6 +1,5 @@
 package org.splat.simer;
 
-import org.splat.dal.bo.kernel.User;
 import org.splat.dal.bo.som.KnowledgeElement;
 import org.splat.dal.bo.som.KnowledgeElementType;
 import org.splat.dal.bo.som.Scenario;
@@ -9,6 +8,7 @@ import org.splat.service.KnowledgeElementTypeService;
 import org.splat.service.ScenarioService;
 import org.splat.service.dto.KnowledgeElementDTO;
 import org.splat.som.Step;
+import org.splat.wapp.Constants;
 
 /**
  * Action for addition and modification of knowledge elements in the selected scenario.
@@ -23,15 +23,15 @@ public class EditKnowledgeElementAction extends DisplayStudyStepAction {
 	/**
 	 * Edited knowledge element type.
 	 */
-	private String type = null; // Edited knowledge type
+	private String _knowledgeType = null; // Edited knowledge type
 	/**
 	 * Edited knowledge element title.
 	 */
-	private String title = null;
+	private String _knowledgeTitle = null;
 	/**
 	 * Edited knowledge element value.
 	 */
-	private String value = null;
+	private String _knowledgeValue = null;
 	/**
 	 * Injected scenario service.
 	 */
@@ -83,15 +83,15 @@ public class EditKnowledgeElementAction extends DisplayStudyStepAction {
 	public String doInitialize() {
 		_openStudy = getOpenStudy();
 
-		setMenuProperty("study");
-		setTitleProperty("study");
+		setMenuProperty(Constants.STUDY_MENU);
+		setTitleProperty(Constants.STUDY_MENU);
 		if ("true".equals(getWriteAccess())
 				&& getUserRights().canCreateDocument()) {
-			setToolProperty("study");
+			setToolProperty(Constants.STUDY_MENU);
 		} else {
 			setToolProperty("standard");
 		}
-		setLeftMenuProperty("study");
+		setLeftMenuProperty(Constants.STUDY_MENU);
 		initializationFullScreenContext(_menuProperty, _titleProperty,
 				_editDisabledProperty, _toolProperty, _leftMenuProperty);
 
@@ -105,52 +105,52 @@ public class EditKnowledgeElementAction extends DisplayStudyStepAction {
 	 */
 	public String doSetKnowledge() {
 
-		setMenuProperty("study");
-		setTitleProperty("study");
+		String res = SUCCESS;
+		setMenuProperty(Constants.STUDY_MENU);
+		setTitleProperty(Constants.STUDY_MENU);
 		if ("true".equals(getWriteAccess())
 				&& getUserRights().canCreateDocument()) {
-			setToolProperty("study");
+			setToolProperty(Constants.STUDY_MENU);
 		} else {
 			setToolProperty("standard");
 		}
-		setLeftMenuProperty("study");
+		setLeftMenuProperty(Constants.STUDY_MENU);
 		initializationFullScreenContext(_menuProperty, _titleProperty,
 				_editDisabledProperty, _toolProperty, _leftMenuProperty);
 
 		try {
-			User user = getConnectedUser();
 			_openStudy = getOpenStudy();
 
-			Step step = _openStudy.getSelectedStep();
-			Scenario scene = (Scenario) step.getOwner(); // It is necessarily a Scenario
-
-			if ((title == null) || (value == null)) { 
+			if ((_knowledgeTitle == null) || (_knowledgeValue == null)) {
 				KnowledgeElementDTO kelm = new KnowledgeElementDTO(Integer
-						.valueOf(type), title, value);
-				if (value == null) { // Renaming of an existing Knowledge Element
-					getKnowledgeElementService().rename(kelm, title);
+						.valueOf(_knowledgeType), _knowledgeTitle,
+						_knowledgeValue);
+				if (_knowledgeValue == null) { // Renaming of an existing Knowledge Element
+					getKnowledgeElementService().rename(kelm, _knowledgeTitle);
 				} else { // Edition of a knowledge
-					getKnowledgeElementService().update(kelm, value);
+					getKnowledgeElementService().update(kelm, _knowledgeValue);
 				}
 				_openStudy.update(kelm); // For updating the truncated value
 			} else { // Addition of a new Knowledge Element
 				KnowledgeElement.Properties kprop = new KnowledgeElement.Properties();
 				KnowledgeElementType ktype = getKnowledgeElementTypeService()
-						.selectType(Integer.valueOf(type));
-				kprop.setType(ktype).setTitle(title).setValue(value).setAuthor(
-						user);
-				_openStudy.add(getScenarioService().addKnowledgeElement(scene,
+						.selectType(Integer.valueOf(_knowledgeType));
+				kprop.setType(ktype).setTitle(_knowledgeTitle).setValue(
+						_knowledgeValue).setAuthor(getConnectedUser());
+				_openStudy.add(getScenarioService().addKnowledgeElement(
+						(Scenario) _openStudy.getSelectedStep().getOwner(),
 						kprop));
-				getMenu("study").selects(_openStudy.getSelection()); // Updates the menu icon, in case of first added document
+				getMenu(Constants.STUDY_MENU)
+						.selects(_openStudy.getSelection()); // Updates the menu icon, in case of first added document
 			}
-			return SUCCESS;
 		} catch (RuntimeException saverror) {
 			LOG.error("Reason:", saverror);
-			return ERROR;
+			res = ERROR;
 		} catch (Exception error) {
 			LOG.error("Exception while saving a knowledge: ", error);
-			return INPUT;
+			res = INPUT;
 		}
+		return res;
 	}
 
 	/**
@@ -211,17 +211,17 @@ public class EditKnowledgeElementAction extends DisplayStudyStepAction {
 	 * Update current menu.
 	 */
 	private void updateMenu() {
-		getMenu("study").selects(_openStudy.getSelection()); // Updates the menu icon, in case of last removed document
+		getMenu(Constants.STUDY_MENU).selects(_openStudy.getSelection()); // Updates the menu icon, in case of last removed document
 
-		setMenuProperty("study");
-		setTitleProperty("study");
+		setMenuProperty(Constants.STUDY_MENU);
+		setTitleProperty(Constants.STUDY_MENU);
 		if ("true".equals(getWriteAccess())
 				&& getUserRights().canCreateDocument()) {
-			setToolProperty("study");
+			setToolProperty(Constants.STUDY_MENU);
 		} else {
 			setToolProperty("standard");
 		}
-		setLeftMenuProperty("study");
+		setLeftMenuProperty(Constants.STUDY_MENU);
 		initializationFullScreenContext(_menuProperty, _titleProperty,
 				_editDisabledProperty, _toolProperty, _leftMenuProperty);
 
@@ -237,8 +237,7 @@ public class EditKnowledgeElementAction extends DisplayStudyStepAction {
 	 * @return the knowledge type name
 	 */
 	public String getKnowledgeType() {
-		// ---------------------------------
-		return type;
+		return _knowledgeType;
 	}
 
 	/**
@@ -247,7 +246,6 @@ public class EditKnowledgeElementAction extends DisplayStudyStepAction {
 	 * @return the knowledge element id
 	 */
 	public String getSelectedKnowledge() {
-		// -------------------------------------
 		return _myindex;
 	}
 
@@ -258,8 +256,7 @@ public class EditKnowledgeElementAction extends DisplayStudyStepAction {
 	 *            the knowledge type name
 	 */
 	public void setKnowledgeType(final String type) {
-		// ------------------------------------------
-		this.type = type;
+		this._knowledgeType = type;
 	}
 
 	/**
@@ -269,8 +266,7 @@ public class EditKnowledgeElementAction extends DisplayStudyStepAction {
 	 *            the new knowledge title
 	 */
 	public void setKnowledgeTitle(final String title) {
-		// --------------------------------------------
-		this.title = title;
+		this._knowledgeTitle = title;
 	}
 
 	/**
@@ -280,8 +276,7 @@ public class EditKnowledgeElementAction extends DisplayStudyStepAction {
 	 *            the knowledge value
 	 */
 	public void setKnowledgeValue(final String value) {
-		// --------------------------------------------
-		this.value = value;
+		this._knowledgeValue = value;
 	}
 
 	/**
@@ -448,4 +443,22 @@ public class EditKnowledgeElementAction extends DisplayStudyStepAction {
 		_leftMenuProperty = leftMenuProperty;
 	}
 
+	/**
+	 * Get the knowledgeValue.
+	 * 
+	 * @return the knowledgeValue
+	 */
+	public String getKnowledgeValue() {
+		return _knowledgeValue;
+	}
+
+	/**
+	 * Get the knowledgeTitle.
+	 * 
+	 * @return the knowledgeTitle
+	 */
+	public String getKnowledgeTitle() {
+		return _knowledgeTitle;
+	}
+
 }
\ No newline at end of file
diff --git a/Workspace/Siman/src/org/splat/simer/EditSimulationContextAction.java b/Workspace/Siman/src/org/splat/simer/EditSimulationContextAction.java
index 5ed1a7d..036ea3a 100644
--- a/Workspace/Siman/src/org/splat/simer/EditSimulationContextAction.java
+++ b/Workspace/Siman/src/org/splat/simer/EditSimulationContextAction.java
@@ -6,21 +6,48 @@ import java.util.List;
 import org.splat.dal.bo.som.ProjectElement;
 import org.splat.dal.bo.som.SimulationContext;
 import org.splat.dal.bo.som.SimulationContextType;
+import org.splat.dal.bo.som.Study;
 import org.splat.service.SimulationContextService;
 import org.splat.service.SimulationContextTypeService;
 import org.splat.service.StepService;
 import org.splat.service.StudyService;
 import org.splat.som.Step;
-import org.splat.dal.bo.som.Study;
+import org.splat.wapp.Constants;
 
+/**
+ * Action for simulation context selection or input.
+ */
 public class EditSimulationContextAction extends DisplayStudyStepAction {
 
-	private List<SimulationContextType> contype = null;
-	private List<SimulationContext> contelm = null;
-	private String selectype = null; // Context type, if selected
-	private String newtype = null; // Context type, if newed
-	private SimulationContextType type = null; // Corresponding context type object
-	private String value = null; // Context value
+	/**
+	 * Serialization version id.
+	 */
+	private static final long serialVersionUID = -641719644024601042L;
+
+	/**
+	 * List of involved context types.
+	 */
+	private transient List<SimulationContextType> _contype = null;
+	/**
+	 * List of simulation context values of the selected type.
+	 */
+	private transient List<SimulationContext> _contelm = null;
+	/**
+	 * Context type, if selected.
+	 */
+	private transient String _selectype = null;
+	/**
+	 * Context type, if newed.
+	 */
+	private transient String _newtype = null;
+	/**
+	 * Corresponding context type object.
+	 */
+	private transient SimulationContextType _type = null;
+	/**
+	 * Context value.
+	 */
+	private transient String _value = null;
 	/**
 	 * Injected study service.
 	 */
@@ -37,147 +64,186 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
 	 * Injected simulation context type service.
 	 */
 	private SimulationContextTypeService _simulationContextTypeService;
-	
+
 	/**
-	 * Value of the menu property. 
-	 * It can be: none, create, open, study, knowledge, sysadmin, help.
+	 * Value of the menu property. It can be: none, create, open, study, knowledge, sysadmin, help.
 	 */
 	private String _menuProperty;
-	
+
 	/**
-	 * Value of the title bar property. 
-	 * It can be: study, knowledge.
+	 * Value of the title bar property. It can be: study, knowledge.
 	 */
 	private String _titleProperty;
-	
+
 	/**
-	 * Value of the tool bar property. 
-	 * It can be: none, standard, study, back.
+	 * Value of the tool bar property. It can be: none, standard, study, back.
 	 */
 	private String _toolProperty;
-	
+
 	/**
-	 * Value of the left menu property. 
-	 * It can be: open, study, knowledge, scenario.
+	 * Value of the left menu property. It can be: open, study, knowledge, scenario.
 	 */
 	private String _leftMenuProperty;
-	
+
 	/**
-	 * Property that indicates whether the current open study is editable or not.
-	 * On the screen it looks like pen on the status icon, pop-up menu also can be called.
-	 * It is necessary for correct building the title bar.
+	 * Property that indicates whether the current open study is editable or not. On the screen it looks like pen on the status icon, pop-up
+	 * menu also can be called. It is necessary for correct building the title bar.
 	 */
 	private String _editDisabledProperty = "false";
 
-	private static final long serialVersionUID = -641719644024601042L;
-
 	// ==============================================================================================================================
 	// Action methods
 	// ==============================================================================================================================
 
+	/**
+	 * Initialize context input/selection action.
+	 * 
+	 * @return "create" if there is no involved context types or "select" otherwise
+	 */
 	public String doInitialize() {
 
+		String res;
 		_openStudy = getOpenStudy();
-		contype = getInvolvedContexts();
-		
-		setMenuProperty("study");
-		setTitleProperty("study");
-		if ("true".equals(getWriteAccess()) &&  getUserRights().canCreateDocument()) {
-			setToolProperty("study");
+		_contype = getInvolvedContexts();
+
+		setMenuProperty(Constants.STUDY_MENU);
+		setTitleProperty(Constants.STUDY_MENU);
+		if (Constants.TRUE.equals(getWriteAccess())
+				&& getUserRights().canCreateDocument()) {
+			setToolProperty(Constants.STUDY_MENU);
 		} else {
-			setToolProperty("standard");
+			setToolProperty(Constants.STANDARD_MENU);
 		}
-		
-		setLeftMenuProperty("study");
-		initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
-
-		if (contype.isEmpty())
-			return "create";
-		else
-			return "select";
+
+		setLeftMenuProperty(Constants.STUDY_MENU);
+		initializationFullScreenContext(_menuProperty, _titleProperty,
+				_editDisabledProperty, _toolProperty, _leftMenuProperty);
+
+		if (_contype.isEmpty()) {
+			res = "create";
+			setAction("newContext");
+		} else {
+			res = "select";
+			setAction("selectContext");
+		}
+		return res;
 	}
 
+	/**
+	 * Select or create a simulation context. If a type has been selected then initialize the list of context values.
+	 * 
+	 * @return "set" if context type is selected or "create" otherwise
+	 */
 	public String doSelectContext() {
+		String res = "set";
 		_openStudy = getOpenStudy();
-		
-		setMenuProperty("study");
-		setTitleProperty("study");
-		if ("true".equals(getWriteAccess()) &&  getUserRights().canCreateDocument()) {
-			setToolProperty("study");
+
+		setMenuProperty(Constants.STUDY_MENU);
+		setTitleProperty(Constants.STUDY_MENU);
+		if (Constants.TRUE.equals(getWriteAccess())
+				&& getUserRights().canCreateDocument()) {
+			setToolProperty(Constants.STUDY_MENU);
 		} else {
-			setToolProperty("standard");
+			setToolProperty(Constants.STANDARD_MENU);
 		}
-		setLeftMenuProperty("study");
-		initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
-		
-		int typid = Integer.valueOf(selectype);
-		if (typid == 0)
-			return "create";
-
-		SimulationContext.Properties cprop = new SimulationContext.Properties();
-		type = getSimulationContextService().selectType(typid);
-		newtype = type.getName();
-		contype = getInvolvedContexts();
-		contelm = getSimulationContextService()
-				.selectSimulationContextsWhere(cprop.setType(type));
-
-		return "set";
+		setLeftMenuProperty(Constants.STUDY_MENU);
+		initializationFullScreenContext(_menuProperty, _titleProperty,
+				_editDisabledProperty, _toolProperty, _leftMenuProperty);
+
+		int typid = Integer.valueOf(_selectype);
+		if (typid == 0) {
+			res = "create";
+			setAction("newContext");
+		} else {
+
+			SimulationContext.Properties cprop = new SimulationContext.Properties();
+			_type = getSimulationContextService().selectType(typid);
+			_newtype = _type.getName();
+			_contype = getInvolvedContexts();
+			_contelm = getSimulationContextService()
+					.selectSimulationContextsWhere(cprop.setType(_type));
+			
+			setAction("setContext");
+			setIndex(String.valueOf(getContextType().getIndex()));
+		}
+
+		return res;
 	}
 
+	/**
+	 * Create new context. Add the created context to the step and reindex the study. <BR>
+	 * If type or value are undefined then return INPUT.
+	 * 
+	 * @return SUCCESS if added or ERROR or INPUT if failed
+	 */
 	public String doCreateContext() {
-		// --------------------------------
+		String res = SUCCESS;
 		try {
 			_openStudy = getOpenStudy();
-			
-			setMenuProperty("study");
-			setTitleProperty("study");
-			if ("true".equals(getWriteAccess()) &&  getUserRights().canCreateDocument()) {
-				setToolProperty("study");
+
+			setMenuProperty(Constants.STUDY_MENU);
+			setTitleProperty(Constants.STUDY_MENU);
+			if (Constants.TRUE.equals(getWriteAccess())
+					&& getUserRights().canCreateDocument()) {
+				setToolProperty(Constants.STUDY_MENU);
 			} else {
-				setToolProperty("standard");
+				setToolProperty(Constants.STANDARD_MENU);
 			}
-			setLeftMenuProperty("study");
-			initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
-			
-			if (newtype.length() == 0 || value.length() == 0)
-				return INPUT;
+			setLeftMenuProperty(Constants.STUDY_MENU);
+			initializationFullScreenContext(_menuProperty, _titleProperty,
+					_editDisabledProperty, _toolProperty, _leftMenuProperty);
 
-			Step step = _openStudy.getSelectedStep();
-			ProjectElement owner = step.getOwner();
+			if (_newtype.length() == 0 || _value.length() == 0) {
+				res = INPUT;
+			} else {
 
-			SimulationContext.Properties cprop = new SimulationContext.Properties();
-			SimulationContext contex = null;
-			type = getSimulationContextTypeService().createType(newtype,
-					step.getStep());
-			cprop.setType(type).setValue(value);
-			if (owner instanceof Study)
-				contex = getStudyService().addProjectContext(((Study) owner),
-						cprop); // Re-indexes knowledges and the study
-			else
-				contex = getStepService().addSimulationContext(step, cprop); // Re-indexes knowledges only
+				Step step = _openStudy.getSelectedStep();
+				ProjectElement owner = step.getOwner();
 
-			_openStudy.add(contex);
-			return SUCCESS;
+				SimulationContext.Properties cprop = new SimulationContext.Properties();
+				SimulationContext contex = null;
+				_type = getSimulationContextTypeService().createType(_newtype,
+						step.getStep());
+				cprop.setType(_type).setValue(_value);
+				if (owner instanceof Study) {
+					contex = getStudyService().addProjectContext(
+							((Study) owner), cprop); // Re-indexes knowledges and the study
+				} else {
+					contex = getStepService().addSimulationContext(step, cprop); // Re-indexes knowledges only
+				}
+
+				_openStudy.add(contex);
+			}
 		} catch (RuntimeException saverror) {
 			LOG.error("Reason:", saverror);
-			return ERROR;
+			res = ERROR;
 		} catch (Exception error) {
-			return INPUT;
+			setAction("newContext");
+			res = INPUT;
 		}
+		return res;
 	}
 
+	/**
+	 * Remove the selected simulation context from the study step.
+	 * 
+	 * @return SUCCESS if removed or ERROR if failed
+	 */
 	public String doDeleteContext() {
-		
-		setMenuProperty("study");
-		setTitleProperty("study");
-		if ("true".equals(getWriteAccess()) &&  getUserRights().canCreateDocument()) {
-			setToolProperty("study");
+
+		String res = SUCCESS;
+		setMenuProperty(Constants.STUDY_MENU);
+		setTitleProperty(Constants.STUDY_MENU);
+		if (Constants.TRUE.equals(getWriteAccess())
+				&& getUserRights().canCreateDocument()) {
+			setToolProperty(Constants.STUDY_MENU);
 		} else {
-			setToolProperty("standard");
+			setToolProperty(Constants.STANDARD_MENU);
 		}
-		setLeftMenuProperty("study");
-		initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
-		
+		setLeftMenuProperty(Constants.STUDY_MENU);
+		initializationFullScreenContext(_menuProperty, _titleProperty,
+				_editDisabledProperty, _toolProperty, _leftMenuProperty);
+
 		try {
 			_openStudy = getOpenStudy();
 
@@ -185,36 +251,43 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
 			ProjectElement owner = step.getOwner();
 			SimulationContext context = step.getSimulationContext(Integer
 					.valueOf(_myindex));
-			if (owner instanceof Study)
+			if (owner instanceof Study) {
 				getStudyService()
 						.removeProjectContext(((Study) owner), context); // Re-indexes knowledges and the study
-			else
+			} else {
 				getStepService().removeSimulationContext(step, context); // Re-indexes knowledges only
+			}
 
 			_openStudy.remove(context);
-			return SUCCESS;
 		} catch (RuntimeException saverror) {
 			LOG.error("Reason:", saverror);
-			return ERROR;
+			res = ERROR;
 		}
+		return res;
 	}
 
+	/**
+	 * Add the selected context to the study step and reindex the study. <BR>
+	 * If type or value are undefined then return INPUT.
+	 * 
+	 * @return SUCCESS if added or ERROR or INPUT if failed
+	 */
 	public String doSetContext() {
-		// -----------------------------
-		String[] input = value.split(",");
-//		Session connex = Database.getCurSession();
-//		Transaction transax = connex.beginTransaction();
-		
-		setMenuProperty("study");
-		setTitleProperty("study");
-		if ("true".equals(getWriteAccess()) &&  getUserRights().canCreateDocument()) {
-			setToolProperty("study");
+		String res = SUCCESS;
+		String[] input = _value.split(",");
+
+		setMenuProperty(Constants.STUDY_MENU);
+		setTitleProperty(Constants.STUDY_MENU);
+		if (Constants.TRUE.equals(getWriteAccess())
+				&& getUserRights().canCreateDocument()) {
+			setToolProperty(Constants.STUDY_MENU);
 		} else {
-			setToolProperty("standard");
+			setToolProperty(Constants.STANDARD_MENU);
 		}
-		setLeftMenuProperty("study");
-		initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
-		
+		setLeftMenuProperty(Constants.STUDY_MENU);
+		initializationFullScreenContext(_menuProperty, _titleProperty,
+				_editDisabledProperty, _toolProperty, _leftMenuProperty);
+
 		try {
 			_openStudy = getOpenStudy();
 
@@ -228,86 +301,122 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
 				int valid = Integer.valueOf(input[0]);
 				contex = getSimulationContextService().selectSimulationContext(
 						valid);
-				if (owner instanceof Study)
+				if (owner instanceof Study) {
 					getStudyService()
 							.addProjectContext(((Study) owner), contex);
-				else
+				} else {
 					getStepService().addSimulationContext(step, contex);
+				}
 			} else {
 				// Setting a new simulation context value (input = 0,"new context value")
-				int typid = Integer.valueOf(selectype);
+				int typid = Integer.valueOf(_selectype);
 				SimulationContext.Properties cprop = new SimulationContext.Properties();
 				cprop.setType(getSimulationContextService().selectType(typid))
 						.setValue(input[1].trim());
-				if (owner instanceof Study)
+				if (owner instanceof Study) {
 					contex = getStudyService().addProjectContext(
 							((Study) owner), cprop); // Re-indexes knowledges and the study
-				else
+				} else {
 					contex = getStepService().addSimulationContext(step, cprop); // Re-indexes knowledges only
+				}
 			}
 			_openStudy.add(contex);
-			contype = getInvolvedContexts();
+			_contype = getInvolvedContexts();
+			
+			setAction("setContext");
+			setIndex(String.valueOf(getContextType().getIndex()));
 
-//			transax.commit();
-			return SUCCESS;
 		} catch (RuntimeException saverror) {
 			LOG.error("Reason:", saverror);
-			return ERROR;
+			res = ERROR;
 		} catch (Exception error) {
-			value = input[0];
-			return INPUT;
+			_value = input[0];
+			setAction("setContext");
+			res = INPUT;
 		}
+		return res;
 	}
 
 	// ==============================================================================================================================
 	// Getters and setters
 	// ==============================================================================================================================
 
+	/**
+	 * Get context type.
+	 * 
+	 * @return Corresponding context type object
+	 */
 	public SimulationContextType getContextType() {
-		// ----------------------------------------------
-		return type;
+		return _type;
 	}
 
+	/**
+	 * Get the new context type to be created.
+	 * 
+	 * @return Context type, if newed
+	 */
 	public String getContextName() {
-		// -------------------------------
-		return newtype;
+		return _newtype;
 	}
 
-	// public List<SimulationContextFacade> getSimulationContexts () {
-	// -------------------------------------------------------
-	// return mystudy.getSelectedStep().getAllSimulationContexts();
-	// }
+	/**
+	 * Get the list of involved context types.
+	 * 
+	 * @return List of involved context types
+	 */
 	public List<SimulationContextType> getSimulationContextTypes() {
-		// ---------------------------------------------------------------
-		return contype;
+		return _contype;
 	}
 
+	/**
+	 * Get the list of simulation context values of the selected type.
+	 * 
+	 * @return List of simulation context values of the selected type
+	 */
 	public List<SimulationContext> getSimulationContextValues() {
-		// ------------------------------------------------------------
-		return contelm;
+		return _contelm;
 	}
 
-	public void setContextType(String type) {
-		// ----------------------------------------
-		this.selectype = type;
+	/**
+	 * Get the selected context type.
+	 * 
+	 * @param type
+	 *            Context type, if selected
+	 */
+	public void setContextType(final String type) {
+		this._selectype = type;
 	}
 
-	public void setContextValue(String value) {
-		// -----------------------------------------
-		this.value = value;
+	/**
+	 * Set the context value.
+	 * 
+	 * @param value
+	 *            context value
+	 */
+	public void setContextValue(final String value) {
+		this._value = value;
 	}
 
-	public void setNewType(String name) {
-		// ------------------------------------
-		this.newtype = name;
+	/**
+	 * Set the new context type.
+	 * 
+	 * @param name
+	 *            the new context type
+	 */
+	public void setNewType(final String name) {
+		this._newtype = name;
 	}
 
 	// ==============================================================================================================================
 	// Private service
 	// ==============================================================================================================================
 
+	/**
+	 * Get the list of context types involved in the current study step.
+	 * 
+	 * @return the list of context types
+	 */
 	private List<SimulationContextType> getInvolvedContexts() {
-		// ----------------------------------------------------------
 		SimulationContextType.Properties sprop = new SimulationContextType.Properties()
 				.setStep(_openStudy.getSelectedStep().getStep());
 		List<SimulationContextType> contype = getSimulationContextService()
@@ -323,16 +432,19 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
 			int to = 0;
 			while (to < types.length - 1) {
 				to += 1;
-				if (types[to].isApproved() == state)
+				if (types[to].isApproved() == state) {
 					continue;
+				}
 
-				if (to > from + 1)
+				if (to > from + 1) {
 					Arrays.sort(types, from, to, compare);
-				state = !state;
+				}
+				state ^= state;
 				from = to;
 			}
-			if (to > from)
+			if (to > from) {
 				Arrays.sort(types, from, to + 1, compare);
+			}
 			contype = Arrays.asList(types);
 		}
 		return contype;
@@ -343,6 +455,7 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
 	 * 
 	 * @return the studyService
 	 */
+	@Override
 	public StudyService getStudyService() {
 		return _studyService;
 	}
@@ -353,7 +466,8 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
 	 * @param studyService
 	 *            the studyService to set
 	 */
-	public void setStudyService(StudyService studyService) {
+	@Override
+	public void setStudyService(final StudyService studyService) {
 		_studyService = studyService;
 	}
 
@@ -373,12 +487,13 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
 	 *            the simulationContextService to set
 	 */
 	public void setSimulationContextService(
-			SimulationContextService simulationContextService) {
+			final SimulationContextService simulationContextService) {
 		_simulationContextService = simulationContextService;
 	}
 
 	/**
 	 * Get the simulationContextTypeService.
+	 * 
 	 * @return the simulationContextTypeService
 	 */
 	public SimulationContextTypeService getSimulationContextTypeService() {
@@ -387,13 +502,15 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
 
 	/**
 	 * Set the simulationContextTypeService.
-	 * @param simulationContextTypeService the simulationContextTypeService to set
+	 * 
+	 * @param simulationContextTypeService
+	 *            the simulationContextTypeService to set
 	 */
 	public void setSimulationContextTypeService(
-			SimulationContextTypeService simulationContextTypeService) {
+			final SimulationContextTypeService simulationContextTypeService) {
 		_simulationContextTypeService = simulationContextTypeService;
 	}
-	
+
 	/**
 	 * Get the stepService.
 	 * 
@@ -409,86 +526,111 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
 	 * @param stepService
 	 *            the stepService to set
 	 */
-	public void setStepService(StepService stepService) {
+	public void setStepService(final StepService stepService) {
 		_stepService = stepService;
 	}
-	
+
 	/**
 	 * Get the menuProperty.
+	 * 
 	 * @return the menuProperty
 	 */
+	@Override
 	public String getMenuProperty() {
 		return _menuProperty;
 	}
 
 	/**
 	 * Set the menuProperty.
-	 * @param menuProperty the menuProperty to set
+	 * 
+	 * @param menuProperty
+	 *            the menuProperty to set
 	 */
-	public void setMenuProperty(String menuProperty) {
+	@Override
+	public void setMenuProperty(final String menuProperty) {
 		this._menuProperty = menuProperty;
 	}
-	
+
 	/**
 	 * Get the _titleProperty.
+	 * 
 	 * @return the _titleProperty
 	 */
+	@Override
 	public String getTitleProperty() {
 		return _titleProperty;
 	}
 
 	/**
-	 * Set the _titleProperty.
-	 * @param _titleProperty the titleProperty to set
+	 * Set the titleProperty.
+	 * 
+	 * @param titleProperty
+	 *            the titleProperty to set
 	 */
-	public void setTitleProperty(String titleProperty) {
+	@Override
+	public void setTitleProperty(final String titleProperty) {
 		_titleProperty = titleProperty;
 	}
 
 	/**
 	 * Get the editDisabledProperty.
+	 * 
 	 * @return the editDisabledProperty
 	 */
+	@Override
 	public final String getEditDisabledProperty() {
 		return _editDisabledProperty;
 	}
 
 	/**
 	 * Set the editDisabledProperty.
-	 * @param editDisabledProperty the editDisabledProperty to set
+	 * 
+	 * @param editDisabledProperty
+	 *            the editDisabledProperty to set
 	 */
-	public final void setEditDisabledProperty(String editDisabledProperty) {
+	@Override
+	public final void setEditDisabledProperty(final String editDisabledProperty) {
 		_editDisabledProperty = editDisabledProperty;
 	}
 
 	/**
 	 * Get the toolProperty.
+	 * 
 	 * @return the toolProperty
 	 */
+	@Override
 	public String getToolProperty() {
 		return _toolProperty;
 	}
 
 	/**
 	 * Set the toolProperty.
-	 * @param toolProperty the toolProperty to set
+	 * 
+	 * @param toolProperty
+	 *            the toolProperty to set
 	 */
+	@Override
 	public void setToolProperty(final String toolProperty) {
 		_toolProperty = toolProperty;
 	}
-	
+
 	/**
 	 * Get the leftMenuProperty.
+	 * 
 	 * @return the leftMenuProperty
 	 */
+	@Override
 	public String getLeftMenuProperty() {
 		return _leftMenuProperty;
 	}
 
 	/**
 	 * Set the leftMenuProperty.
-	 * @param leftMenuProperty the leftMenuProperty to set
+	 * 
+	 * @param leftMenuProperty
+	 *            the leftMenuProperty to set
 	 */
+	@Override
 	public void setLeftMenuProperty(final String leftMenuProperty) {
 		_leftMenuProperty = leftMenuProperty;
 	}
diff --git a/Workspace/Siman/src/org/splat/simer/OpenStudy.java b/Workspace/Siman/src/org/splat/simer/OpenStudy.java
index 82dcc0e..1fef311 100644
--- a/Workspace/Siman/src/org/splat/simer/OpenStudy.java
+++ b/Workspace/Siman/src/org/splat/simer/OpenStudy.java
@@ -97,8 +97,8 @@ public class OpenStudy extends AbstractOpenObject implements OpenStudyServices {
 	public OpenStudy open(final User user, final Study study) {
 		ResourceBundle custom = ResourceBundle.getBundle("som",
 				getApplicationSettings().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());
 
@@ -257,8 +257,8 @@ public class OpenStudy extends AbstractOpenObject implements OpenStudyServices {
 			// Transfer to the document of all known properties
 			ResourceBundle locale = ResourceBundle.getBundle("som",
 					getApplicationSettings().getCurrentLocale());
-			SimpleDateFormat get = new SimpleDateFormat(
-					locale.getString("date.format"));
+			SimpleDateFormat get = new SimpleDateFormat(locale
+					.getString("date.format"));
 			Writer tool = Toolbox.getWriter(credoc);
 			List<Step> slist = getInvolvedSteps();
 			for (Iterator<Step> i = slist.iterator(); i.hasNext();) {
@@ -267,15 +267,14 @@ public class OpenStudy extends AbstractOpenObject implements OpenStudyServices {
 				for (Iterator<SimulationContext> j = clist.iterator(); j
 						.hasNext();) {
 					SimulationContext context = j.next();
-					tool.updateProperty(context.getType().getName(),
-							context.getValue());
+					tool.updateProperty(context.getType().getName(), context
+							.getValue());
 				}
 			}
 			tool.updateProperty("reference", medoc.getReference());
 			tool.updateProperty("study", _mystudy.getTitle());
-			tool.updateProperty("step",
-					locale.getString("folder.step." + step.getNumber())
-							.replaceAll("''", "'"));
+			tool.updateProperty("step", locale.getString(
+					"folder.step." + step.getNumber()).replaceAll("''", "'"));
 			tool.updateProperty("author", author.getUsername().toUpperCase());
 			tool.updateProperty("date", get.format(medoc.getCreationDate()));
 			tool.updateProperty("history", locale.getString("label.creation")
@@ -345,8 +344,8 @@ public class OpenStudy extends AbstractOpenObject implements OpenStudyServices {
 	}
 
 	protected void add(final KnowledgeElement kelm) {
-		KnowledgeElementFacade facade = new KnowledgeElementFacade(
-				BeanHelper.copyBean(kelm, KnowledgeElementDTO.class),
+		KnowledgeElementFacade facade = new KnowledgeElementFacade(BeanHelper
+				.copyBean(kelm, KnowledgeElementDTO.class),
 				getApplicationSettings());
 		// RKV KnowledgeIterator known = knowledge.get(kelm.getType().getIndex() - 2);
 		// Knowledges are ordered by type index, from 0 to n-1, the first one being reserved (reason for -2)
@@ -406,19 +405,30 @@ public class OpenStudy extends AbstractOpenObject implements OpenStudyServices {
 	}
 
 	protected void remove(final KnowledgeElement kelm) {
-		KnowledgeIterator known = _knowledge.get((int) (kelm.getType()
-				.getIndex() - 2));
+		// RKV: KnowledgeIterator known = _knowledge.get((int) (kelm.getType()
+		// RKV: .getIndex() - 2));
 		// Knowledges are ordered by type index, from 0 to n-1, the first one being reserved (reason for -2)
-		knowpres.remove(kelm.getIndex());
-		for (Iterator<KnowledgeElementFacade> i = known._list.iterator(); i
-				.hasNext();) {
-			KnowledgeElementFacade facade = i.next();
-			if (!facade.isFacadeOf(BeanHelper.copyBean(kelm,
-					KnowledgeElementDTO.class))) {
-				continue;
+		// RKV:Begin: Find a knowledge iterator for appropriate knowledge type
+		KnowledgeIterator known = null;
+		for (KnowledgeIterator aKnowledgeSection : _knowledge) {
+			if (aKnowledgeSection.getIndex().equals(
+					String.valueOf(kelm.getType().getIndex()))) {
+				known = aKnowledgeSection;
+				break;
+			}
+		}
+		if (known != null) { // RKV:End
+			knowpres.remove(kelm.getIndex());
+			for (Iterator<KnowledgeElementFacade> i = known._list.iterator(); i
+					.hasNext();) {
+				KnowledgeElementFacade facade = i.next();
+				if (!facade.isFacadeOf(BeanHelper.copyBean(kelm,
+						KnowledgeElementDTO.class))) {
+					continue;
+				}
+				i.remove();
+				break;
 			}
-			i.remove();
-			break;
 		}
 	}
 
diff --git a/Workspace/Siman/src/struts.xml b/Workspace/Siman/src/struts.xml
index b6cae40..bc90fe8 100644
--- a/Workspace/Siman/src/struts.xml
+++ b/Workspace/Siman/src/struts.xml
@@ -195,21 +195,21 @@
         <!-- Edition of simulation contexts
           -->        
         <action name="add-context" class="editSimulationContextAction" method="initialize">
-            <result name="create">/study/displayStudy.jsp?action=newContext</result>
-            <result name="select">/study/displayStudy.jsp?action=selectContext</result>
+            <result name="create" type="tiles">page.newcontext</result>
+            <result name="select" type="tiles">page.selectcontext</result>
         </action>
         <action name="selectContext" class="editSimulationContextAction" method="selectContext">
-            <result name="create">/study/displayStudy.jsp?action=newContext</result>
-            <result name="set">/study/displayStudy.jsp?action=setContext&amp;index=%{contextType.index}</result>
+            <result name="create" type="tiles">page.newcontext</result>
+            <result name="set"    type="tiles">page.setcontext</result>
         </action>
         <action name="newContext" class="editSimulationContextAction" method="createContext">
             <result name="success" type="tiles">page.displaystudy</result>
-            <result name="input">/study/displayStudy.jsp?action=newContext</result>
+            <result name="input" type="tiles">page.newcontext</result>
             <result name="error" type="tiles">page.displaystudy</result>
         </action>
         <action name="setContext" class="editSimulationContextAction" method="setContext">
             <result name="success" type="tiles">page.displaystudy</result>
-            <result name="input">/study/displayStudy.jsp?action=setContext&amp;index=%{contextType.index}</result>
+            <result name="input" type="tiles">page.setcontext</result>
             <result name="error" type="tiles">page.displaystudy</result>
         </action>
         <action name="remove-context" class="editSimulationContextAction" method="deleteContext">
@@ -264,7 +264,8 @@
         <!-- Edition of knowledge elements
           -->        
         <action name="add-knowledge" class="editKnowledgeElementAction" method="initialize">
-			<result name="success">/study/displayStudy.jsp?action=addKnowledge&amp;index=%{knowledgeType}</result>
+<!--             <result name="success">/study/displayStudy.jsp?action=addKnowledge&amp;index=%{knowledgeType}</result>-->
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="edit-knowledge" class="editKnowledgeElementAction" method="initialize">
             <result name="success" type="tiles">page.displaystudy</result>
-- 
2.39.2