From 363238ce30238284f8ce5ff8dc69659b6c712575 Mon Sep 17 00:00:00 2001 From: Frederic Debuire Date: Fri, 15 Feb 2008 19:33:51 +0000 Subject: [PATCH] =?UTF-8?q?Divers=20changement:=20Ajout=20d'image=20pour?= =?UTF-8?q?=20le=20download=20(=C3=A0=20changer)=20Changement=20de=20choos?= =?UTF-8?q?e=20preference?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WebContent/WEB-INF/jsp/addConference4.jsp | 6 +- .../WEB-INF/jsp/choosePreference.jsp | 22 +++-- .../WEB-INF/jsp/choosePreferenceOK.jsp | 15 ---- .../WebContent/WEB-INF/jsp/manageArticle.jsp | 13 +-- .../WEB-INF/jsp/submissionArticleOK.jsp | 14 --- YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml | 80 ++++-------------- .../images/cc-button_cancel-128x128.png | Bin 0 -> 10949 bytes .../images/cc-button_ok-128x128.png | Bin 0 -> 9774 bytes .../images/cc-download_manager-128x128.png | Bin 0 -> 11510 bytes YACOSWeb/WebContent/stylesheets/base.css | 1 - .../ChoosePreferenceController.java | 11 ++- .../ChoosePreferenceControllerOK.java | 26 ------ .../web/PCmember/form/FormPreference.java | 1 - .../controller/ManageArticleController.java | 28 ------ .../controller/SArticleControllerOK.java | 26 ------ .../yacos/web/author/form/ArticleBean.java | 62 -------------- .../web/system/session/SessionService.java | 73 ++++++++-------- 17 files changed, 83 insertions(+), 295 deletions(-) delete mode 100644 YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp delete mode 100644 YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp create mode 100644 YACOSWeb/WebContent/images/cc-button_cancel-128x128.png create mode 100644 YACOSWeb/WebContent/images/cc-button_ok-128x128.png create mode 100644 YACOSWeb/WebContent/images/cc-download_manager-128x128.png delete mode 100644 YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceControllerOK.java delete mode 100644 YACOSWeb/src/org/yacos/web/author/controller/SArticleControllerOK.java delete mode 100644 YACOSWeb/src/org/yacos/web/author/form/ArticleBean.java diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp index 314852f..95b501c 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp @@ -108,14 +108,16 @@ function writePerson() { if (person.max <= person.min) { dwr.util.setValues({id:person.id, label:person.label, min:null, max:null }); - dwr.util.setValues({errorMax:"The max value should'nt be superior to the min value"}); + dwr.util.setValues({errorMax:"The max value should'nt be superior to the min value"}); + $('errorMax').style.display = ""; } else { dwr.engine.beginBatch(); AddCriteriaJS.setCriterionClick(person); fillTable(); dwr.engine.endBatch(); - dwr.util.setValues({ id:-1, label:null, min:1, max:5 }); + dwr.util.setValues({ id:-1, label:null, min:1, max:5 }); + $('errorMax').style.display = "none"; } } diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp index 4e663cd..d1f4f12 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp @@ -6,11 +6,13 @@ -

- +

- - +

+ Choose the preference you have for each article. +

+ + @@ -30,8 +32,16 @@
"/> - - + + + +

+ You have successfully updated the preference.
+ You can modify your choices immediately or later.
+

+ + +
">Home diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp deleted file mode 100644 index 79c17b4..0000000 --- a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp +++ /dev/null @@ -1,15 +0,0 @@ -<%@ include file="/WEB-INF/decorators/include.jsp"%> - - - - - -

- - - - - - - - \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp index 9efb1a0..bf61f9f 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp @@ -7,18 +7,11 @@ -

- - -
@@ -41,9 +34,9 @@
  • Topic: ${article.topic}
    • - Download the article - Modify the article - Suppress the article + ">Download + Modify + Delete diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp deleted file mode 100644 index 36c002a..0000000 --- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp +++ /dev/null @@ -1,14 +0,0 @@ -<%@ include file="/WEB-INF/decorators/include.jsp"%> - - - - -

    NO NAME

    -Soumission OK -
    - -">Home - - - - \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml index fb21436..eccc078 100644 --- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml +++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml @@ -22,63 +22,25 @@ MainController - - SArticleControllerOK - - - ListArticleController - - - ManageArticleController - - - SUserRegistrationController - - - SArticleController - - - ChoosePreferenceController - - - DispatchArticleListController - - - DispatchArticleController - - - AddConferenceController - + ListArticleController + ManageArticleController + SUserRegistrationController + SArticleController + ChoosePreferenceController + DispatchArticleListController + DispatchArticleController + AddConferenceController EvaluationController - - CreateReportController - - - ListConferenceController - - - ChooseConferenceController - - - ValidateArticleController - - - ValideOrRejectController - + CreateReportController + ListConferenceController + ChooseConferenceController + ValidateArticleController + ValideOrRejectController LogonController - - - ListEvaluationController - - - ArticleDownloadController - - - ListReportController - - - ForgotPasswordController - + ListEvaluationController + ArticleDownloadController + ListReportController + ForgotPasswordController DetailArticleController @@ -89,9 +51,6 @@ - - @@ -99,7 +58,6 @@ - @@ -276,10 +234,6 @@ - - - $Lc93g? z&Sk`(0T>j;@#PlwmUk#qkRJOn$Gi<4j}D!dzLb_G5MoG?bG!WZPTkDT{=Yxsu`??X zE)A<1rsXk>4UPL>MH9A;UYl8!JM`>+JG-jbQrl8C!V=OzuTV4;)bE{yzn7sW3<;Y& zO5}KwlBi~xtSNO%-GX8=g4z40zTb1u6TaUA;g5Cli>LbcQ`9nsEj2oDrJy_@>$#3A6=MKhZF(o z_%yOwQ3le4n-6`z)&Ji(z=ML5>|p}nr=yq0K<+o>+KSYLM5GKwBOvnh-TH20^&6%) zj}q!D&_4O>F#nXHe(G?5uO>MxB!=%v)3qG;G+B=XnhOy4_hZfSuknOmUiTiyoB#q@ zIm@Yg`2G_!s$QtxW{&{P!4Zy~U zbY*4wt2TvoJYB&gy09Vv{L>XE!jC%UzbwUl?RifhXRGNiet8-{e7L#VU5vnHaRkW0 zBNK0!Dug(KjWstU3f1YM%AL*6N3E7_LF8X--luFd{*{3copXo z!GT<-q(9x5v%dG3&oHN2r%xH;N;1Uwcx>pyGycHS6?02jw*#Q27@5n(VzC}50Kaw} z-up8vZAvRZayi6oaM{>p7kD=ZV+dG~zZJDQV(75n%wgdro1pzXrNfgec5hv}4I7F9lH>=I%I;}^*@0NZ7HlQOU}Yj5C^q18JPV-fXF2Mr!P?I5W70iSnXCncIf#$@w_`cCs|HNEWrCAaFyMwd%KY zd|R&T7*qSrhTw?sDdT5B4PgWPj|@vK;s&<9y}RKrf{FjD+k2qy@YMsui4lS=e!=5` zNC{tPl^lk&ND;&gXCYe-Un)9O7wP+>@b`DKgJ2%fUxtpGdCe?=*K^JIqspac2tu8~ z%aec4mnpb!ikNNS{e&98k2wd?&wrKDkiRx^h^C0wrka zXxJ9k$c+{6${TgtyS-6fR_cyF1NQ4MD@G z?097U0!t$D^5>6*)_$1^1TiwxML)>agD!2H6Tl zk|BS4czm7|(p3*Z8knV1*8+VwSO#y$jHVG%h34WVOJ-An7Lb7_WMRon4FfGQ6l(5t@+#2`5 zsA2jyTh@R{zZj~ezz}Rk+$khsc+)$ie`A=7X==4Sv2%T&qDi6teu5%|=rI2*f~H;r z;zy_>32qJ+{J46a^tAeUd25hu_u4ipmU8{hrrPJ{;H4f)ZuR?f;-73bWFvl80o7T6 z#&Ds`G8-HAOPW}pT}=E2orA?oY8RS*=o>dT-B>_W0`<1jw3A_+lVO`jDmRu~!*;a! zlm7L2>&MQB{jO)4;qC@-6f>dFk#}F35qGc*$yR@8#QL-+p02pQKikk~gKy+uDX%hd1#0EN|`3n}^RM!K&xgX1SkKnVgd zOMUclM{Ev#S!9=wzn}A}k-&h`NwR7+iqnRuOB8L@Lq&EcGRocc-@#mt`QWW`#WT|A z>oaEr2I-u3Mb&OKXe&g~;J5lQ?KF*{B%|Hz_ESh3Qw>trz!L7~tTB z6YV2-ks{Tvf>NLjJZad{2t8BZjIccsujWYbz^6T^dC855zqzQVzPvf(a!@AfL;d}T zdpWyEm_f@Hpo|dP>RR8BD{+j_Q+oNFF+30b7w{p$4r4EACG0A>oFQO5S%sy?6v>C zGY6PJV1EZ2R^hbJ`;UPi`nF8tv|1gD1+~P>6qz3ba5WjY*n?75{ORw65w4!+D=e6J z3gEdg7})eHUgwHtKkrVt&gTFD2%jCPkVCgi*ZQY6`njkmaw3S95&{5TyIjp~ zY>~JgI1{c8{0*~7VqQOLtA$**(pFW<^iW7;O5My^XPcCP&0TdiK1(UGL0Db0*l>>> zU^H-cW!_zHlTycK)lR4r9J`d4UY>$!$IDHNQ zD;c!Z_=|~&hv!D7E#kTWQAm@(3n56l9okwD;w~*cd)9v>Pzkmqy{0$&4vkJEy|kzr z^Ps_-Nq4MDssz9N2BOn7Y@0`5Luuf>b|i-AqjH3gf9zGB>zaDx;V2#MK$Jc-YMI(( z?-LLy6p)d8kn3KGh^oQT*DkN#ISvM36^W-(8pJISiQgd%+)S; z7tM*;>?9miln_J=sResL)ddj^@FCHOKvbqi8Rk!>234D?`|8IH$8m9 zCx(sc&C#?+%UV%$CTU!a7W`uXUEXCMq@VtG1OagA^;r1WA&TyOfGa_A0gJTdRA+|U ze|x#H>5SfW{6q;Av2)geW*+22?4T~KnOJ(TdS({D91VU~^`K8b47bVlfll<6m|MDm z`9FWr{`u-V_~no{4wrOF1`nv${zAyO^vnQ4TIlj=M;fuD2b=dvp}g+vchU5MAK+cJ zJX#9@vZkj>NS2ED)q+bwD9)zl?9^0>Af*68sX}1m5y~((4MgGlKH|jms6-EpJ3GQB zfY}coor{r8&GR|Q=41@{2V@{+NY((RjyL5Sp?*&Pn=u4%eKG~G5L11J@WeD5>I2-? z&UBB6g2xm7yN?jt+q4LCCxN$Fsbtx@SsaPX&a@a3A?Or$%9PCyJV$C>r7@f!r49x} z80Bz8!AG&F^{bFgGCzV{}fE4trWY*V%OdBuhL9 zr3eJ%*GeFS>Q#KCVN4AovkfB9ch%L?QJyj9h==hiRDx!|D*tX7eOtR{nZ81)An-|q z3f1kkgi5_CN+6PJpD$979a+Q<(uBa-6~wX74E|mPS{&&0+0&=)S^}a3XB2ZMh<+Vr z5BW09?atujBI(u!eP|fDic3kb8e@! zZ?-=QmkgiKm|*Z7%zw?|??$Sz7Ssi;^MBoPeTX#i)4BJ-HOH#)_f07Jpl-G{47L&{ zSzr2nPmP5kp~14AyZl#&rt3$lxS$pm#1Q`-6j=w)!nwyUQ$9{ z=eKA9Sp6qJx7!V}hh4g3Y_w5dKF}^Vfc)$Q_yiJQFhHPMUR3lB2D4^a)U&1H7t!G< zB8KYzSbrN1bH1F|-5v3}A4Z)HVs-~duG1fk9~B~=hU|>Wl5oKtPX6#T~tz$NuIeRU_8{VngwZTDP`ppvc4fD{Uwy%X}a22%^ur;K|^2U zngMZl5`S{l0*3PQwoe@R9r{j_a;@Gs*+q>^*Ec*ZBu`WXcP<=L!;K$ytJ%?XCagJI zhKzxRZc>HPeU@B8>AubO`3=~tzXLiO`eEe@>2V}1DN;ALZ`b@3D(wz)*n)ZZ_=y}> z_?=&fUhi&2e)gorki|KeOf+YJ61b{_c#+ZT$tTl~rSV2~C<}04MYcX-dW=R2woage zQQ(_5+Oq7VV8L(IyOfJB$M&FzqONRr6FDG)pw2z*;BwR2Dfh>eLD%P!lsS{*GB^#_ zF94_e3A1TJ?e6~Y4D19wUZi$6y%RqKP%jQ8U*#9C-@D_q@LNL?mdfP{HABc-!7BGBF$#4VSEOwDVcL5VTsg&tR3>X>d&_ z_@8q4#YBm^6t~=330YfUHFu5WvT+pQb1!$Ftan)zm_o;0xM=F#nQa;nFvM|juKv>${Z{}LdV)Mn(thgF)DkE1 zs-ZC*y{`-C`R8i>Xm<8}sEthqk6Vd=aip|%XgJir8&EmAiN9bUa7xBV2H;Sg757e+p(NHO>^Lt9U+&7Jddi!06d@Gn zWM$>nU)7TFc0oJqWYsymyQ|IXBa~^f!YPuz)yt**R|UOKPZ!*EtMz%o`(=xT-&igx z>cPE9gBOMK+pk=Ae*2>0E&cyI;DV6#5aj)V4JvTQtvcWR5$E~*#f^|qC!Zh*LFi0y z_KLVT`_8r|@I491eH$z3=E2n~b!Xp~Pxiv7Kc?;Vej>WJA1Hw>vCYjxMtL7t+rFxU zZY7d7etwd%rE5c4M`yeG{k=ABRu)g3eQ{1jU!g_wf0U#1srz)w+%{$kCo89RLnej$ zi>*qVEeuy&T22ac3r4+EU9v_rqD>-Bd&x3CX#+}s9W*q)yMC{UD=cZ4ivc-g!k)vc zS)?_~97+m`9kUWACPKp_JXpw5&IX)xAIi14?mJ36bDDlUS(@)2Hgw#}f;&_Z{m!2i z(ziT4XZ!p1d}zdhP8aPbWAqm|1{zm2P`zG2s=h`u0`6aup9~e6l6lo2j>#YOT6p74 zb7y$Crt7OOjPgl(T{Qve$};}=(Z>7P#=jR=q*a~->;G(b;}oCv)Tzctyx0njeI;Cc z`Mo47Yl|fn^~HyRNS8EMug~ccR~G^G!nN;PSfQq)mCKCpefH{nwA7tZ?ZW^gx&0iz zcz_f(xg(!iGCw~Xw6IyoY)_HGW8fM#S9THH2$B?+)B~S|1sX-`3mly#k7Tz#$OP8j zg>Yk;t5;G|;>$OWR_qj}oiT+flDdGtGh|J%PX!GPO$ZLBm6DRGH9yLqr=$UJ6PMPV zF`u}ZpPvs|V6?&I6?~BTfXi}h36wb9oVzg39qj=gJd5KkAM^-vSR%KwvRlW_GwAX?=w#PX2YLd zIYw_j|28{c%3OqKvxd|LUG{ek82{6uyGwubb#w`8Hz zb#)Nh|NLJnDdN=&N20)vS>nDtR!*^7UB1jyNn4e4?dXmL=XAi=g`+ik=)@o&L-gCb zGjo~KUM8X~f1P!L_)^#ik1-d>8bN86u7vmv3=lSqF?jizipGYl-$VAR@BL2uorC?l zhL$XQQOIT7I{kfUoG@+xAgP^>YLIZDhpyQAvFueE{l{{$Z3BJ&Acy8poG?SQ$SdE* zyCo5=A&P+mm~hpI>(*+mqS&K;LH1wY6G(&_(kl#d*jQQV2~qGD7DDP=54kntl`>l! z($7DA0zpWC>-3rAkS0x4U<7(!8&p{%=gbOSiL9PFeIMY_{v;WkrLmZB0&*d}EY+?y zT4ROYuJ*MbpqjpmY27HXupT~OPBiqiG_z8k`=(>&EeKdJNODx$KOU@QYJS7i+(M07 z$Y2iH-z;3(!~1mM*bA2CT3_tA16*I^qrzrPK;bCbPZ zY~+^4h1|SPzO7;(Cf|rtu&>C-aa%T7i-+>;#ARD z8_g3+(RwqqMmETdhfY(*x}fx_H4jXcqHl>c$uc8E^*{^Ye^yp>T&(U@jTxNOiWJWX{h&4c@q#Qs>_p-5(gVH(2%*6{5B+5 z+PvA+=_T$RUG*DlpFv2R>AZ4RtZL%bl`D(qd$)g{9SEX)*hIv8zAJYx(?bSW0Ge+e zbExv_9y_Vbd$?yO%WH5i%jJ-YyubU{(7^V_D7$Efzl6nDLoaFx1ID~cRKpdV%rWV@lwe&BGj&DuiV+c#-sQGQtU!p!-e5F zW7Yb#KJxP0DOjQotW07U7bo#UiK~3$Pt;X~Coxyn)XGh#J#cMKHZu8=@J({RhgnyV zKHEY}M%)k_Ny9!Qd64mI*8|3=y=Sn=0mhABY|q2%COda4TG`v2PlH336uyqW01ORq z@Rf>FUQ*%5hn{2yj|S|HO8Qap&Al$DkTJV+#OfoK0Vbw#T38JM2`f|5`ty4Mytk_} zconzK{9@)MP=b8J9iy7<^uqMs00Sz=F;oWJt|SV(`Yd9q4& zrBS3v-UtSgpP~OEG_mxi+Pic6uhPy*_~*^LC9#Z=EDDzZ1$URs(YI1};4wWSW_Lnp zp9KUr1!a!O63f5g;a3TOyHW=6exlg(=mzh}t~~DN9VAx!3fAqmz{-Zn^HaSw##0D4Es z+>a-;O*fE7*lVqiKq%M!@!|tXRf`Rg`g1e4JkTfob;&W|En_9vg4p#ZJ=6Y6ne+yk zkOi49yssM2${`<~cy=la%cz*TI$ZGG?+z3jvzynlx@C;eG#)K{G38Ull}5I^_HysQ zg%vt+tMGi~_1Vh?l1iFiQ_StLva#IkbsjfyQm~F(ik*{_XBC4Ys}jfZy*CkU8R*fT zmJyFxBpaTg4Dmql-@iMj{DBpjjJQMN;<}NaHN{H)tcm62FMbBGGKq`y`-O!i0Gv(B zOM71yu3s*+kW!zX1P6$OX`u19xa)bwi8I@}fBrq8iOx_WQC zrGfSKwka;-%G!#54)n}K(CX#UG*7gHy*Wejx4%CL^o(g;Mv+9%d%rz&gRTs zt7yDNi*1C8QXiA~YZ|EAXbLKsXkXJHr56n3~JGwVfCpJ5a26rS&F|{>U z#k^1q3k_`QVJ0QWtN940b|Eww%_Hdhd&pQ*JMGRbgnwDv)H2Dgyd3W@JQ<4(>jr4B zjMqnSs(kR3?J9lf&p*EwK(au2>AXF_7#B@zild5ae{DS%+4r1+tf~z4y)$rI#nx^Q zE+1OKwjkEG?$)(v|1}Lfye>s$R0xF&rAJ0sG3J>q%MEECssC7BKJfGV`JzwlDM(F> zf_AtGk_jwna%=I6b#o^z$x|-ilOw)OgRW3fl=dz<2BI^_zd!{ye)tW@ZU5@LT0QE8ki5BmJGZqF*Jjeuf4C3 z(fqir@tcnm7Y5!PW~(={c)as>8<9$Am1id+o0ETOEjxEC=yEC^L8P_-0BGR<-U0|H z%iV7S%gejFi7ix`8}DV8AXuV zeQr&5MNqFDAc}riYMWR<=*13jYxS9qeSOK>?*|+TSyPvG?`h5cusTqIQ*Fkoe8-n- z`^?*KjXki*V^|~-rufa9a`l9#woBDLP`D^vqLF8mGBC%t&xe7p_=AQA*_S{TU8~mx zviXd^T>M_PdV-_FM-a znadG@WSQT|2AZdX#2s;+nNrV^4-ko*PoF*2p%^c|JWEy?Xfgc&xl2@P zbh;}{w7t3-*-`pS6eE?yMeowwV+GV2pRDQ`P7ZOk5~j~|3lxD@H#DS+^cf`PQ6vDG zoSnA6-Lp!$xY+UcrMq?T8_^fw@@30F<^}ihgWj9m-0GE4XYaMUNp#ge6`l-;7~lnZ zUhz!Es+fek0&be@h=)K&8hDn-+EvulFr4eSOCRkp%>=M`&iJ1AuNprJoTd-m3j&?T z*<=C=F^3NV?Uaw(+*n{R7%eRMRqjeTRMv@Os7>Aj_Jn?&*+x27HmsAv{rXC6V?KVy01^p!W4 zqT2k)!#<3*Q@JhSO9#@(#epq1Pw*Z?@`wGE7fXx(H5`z;;r-ekdz@9Tq>;I#+dOv# z=bUaqf1{tl||HW6z^9m^me3RvQI3_xEoKp^})^xi~I z9grRMR8pIsni8jnHuH?#nu2`RlnvWCG<2K~dpKnv@&tsPLLW*uNyrvE;=iID}+h4)gy;LDrwAOM2JhbISuxR?#SD%95CJ6Zs0YeyYhnq~HWgof7eo?tL*>QGF6_F+A+)E)CD6$PFx-6Rc!d zndCeTRNYU-Z>?9DZhu(isOYAKP!>6C(@Z0U$4f~@J!> z?XiOD+1Y9#XnKw7ho3qw#QOla@YwGIbSzi0iymbHhbSRxBzc~iV396QN2M7B%}V7C zYUgv^=$@jYPN&m5`c+-TCNVo2XE(yhRD-U%A}a4Q%8#;9E28n-rA{xa&t~*ISkQzCd^B zuj1nT*c)-RqmQGMe@tI|M)sY90g`v7=zQKyvb%x9$I>@#8(;JEhWf77)Ci#gUf#t= z(S2)vlku(_LO%63`IWak85TrkzD3;6fI2YcYQ>YMN#^mInK$bHY@q@$(^j?x)Y^(KK?g_Q*8H zbMptnd0{U-z3ZBHf&-e8{rv;aIeYoRT5OmGk-23ODVPli!5t>pbk%vgOZ4{DYl=Un z`Ja&vBvyPSnQqfJWcydQmirl)>;tNVpbd2kP|S`b;1Z&6llSDWs^HLPg`s+xg&nKU zu5*`` z>2jQnRDHIGDGv!Nsu*L3$?TKba_fzi7`H}iA)h|oh>qcT{)3zSLIeMV6uI-;t~MqB zjK}`KSr+9xP#TkXasL-8Aa!LFIO~sh2K;I2)EQV_%TAcSyrC>@yD+ca<&=B?e9^1h zcj&6ia{*)b135xb7u?4p(eTEoS)^CRA2DDNte)k>LiV zl(8KuiLKK)6}amuW_fr^v`VfOZV2AtGd^C^&7>l$F_S zCv>Z<+fyQm`)=0z-t(D)%wP5Ve?Jjl;CM)W<@Kbkn&WM7Y3mvHoT><|YIfm~e5W?X zj~eIpB5Pi4%H%-MdEI`Z{A~G|g0Y*>VKEc&+ziSXuq|B=O6qPg} literal 0 HcmV?d00001 diff --git a/YACOSWeb/WebContent/images/cc-button_ok-128x128.png b/YACOSWeb/WebContent/images/cc-button_ok-128x128.png new file mode 100644 index 0000000000000000000000000000000000000000..c7c11172e171335a037154ded8740a3d690e6284 GIT binary patch literal 9774 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 z z?DCzFL%6;H0E;7n4R6MjNH)dFlVls(joa#n`+3 zSGR?l*4jMbo!&mWTvv_T9eJTK3?c{-CDnwP=HsPcZ6z34f0ag9zI%m_Lx1mU?jMH( z5f?*rL22_I29oRuq2>WB@C)_*jO2J8zEOqV&}60n?>`fFlUd4|j*sad$(xhzlb>xEHF|O`F2?)}JO|J{26PID>l?Q5*o1ya>&>uyauuPq z;>G{7*OvYfSd0`p4dBzz`1WvEx*5|qp8+Opa6>qSTiXd#eE9p$K1X6c#J8N@LN4%PFtXO=qWd5Zw1J^HfsNdyPn0_r|WC6+mc+uFRz&ZhJA zMipf^TUNuzWwBaVz4!&{JA2n%M}1&%mA-*{g<@-WyRJLRzZ?6kP9d>Be61%n)ww-* z7;aB5-tXPKlDU8XJ#j(F zBP}Hdi-ngb_cZGxzhx+`lCz8TafxgfQwQ ziDXTQ@@yUUO%Sc)%K$D&csx6*W3P1|WO2ZQ3VAJ1j#z2&Cwo5sbGH1zDkb>cDu12H zjmZ4_zkVSM{Tt%bFupUgg7yf5a)|GNj-6nTIWXacxAF3_QLCRh3L=0Lwa zpUc?B*uBhdmk#C4WD8ENo@B(J+IusnPwx~Z}Oj7 z{T8^$(KCMU_VgZqeq)$pMQLrarCN3{F?Bm=CrRZT`qR~qYqopKIC`NYSk3+`s=+Mh zEARad>q9$-0KDd&&!tvw`HIVqWd6zjOMvYmV7k;Tag{I#EtPS=;ms1S>42_5BiOP* z5d~Zz=0?a-Roh>EJ9Bq7#8F-rdafJh*E7J_ecYEsO-13y66mfHzXd_(*m%^qt~Q$pVMTcB{5slJ~j<*9x|Vtcu?$TL1<~rb#CAiW|D9PmQQqqYFbF%Med{A zr0H`4zP)AgA3D<&tWU=i-4>bpoB@*47QmC7Le1o#66z0Mas3!Q+ns;XSUw6itQsk`imvfALqkhUd$4;N|_8z~L zUhaI53(dyn2cLEc;XqHM9Cy@dQ<()w{}0usOsTCrwzSk} z$Kc}q-_UQQ(wgnObs{{JG5^m0{Zx~0a$kNb1fTfqo|`O<1bC&gX{#D<-vj-0L#|UO zf4bNU)QKmU*E!x{%ke_s4^K&S@&JPZd$S2uD%p5PFrLg{zO_Rl=j`!LLKuVxr)0z zSW?DewD{u@@Jk3$Y8!jzUUl(+N#SX6R`iT+*$`i5BFht#u{tA8XKdnFoYcfglE$rV zSo23zNRzWz<7GNM21XjTZ4t}epKzg#72J#HDY8o)E_JU>vI$$Im;tj+WgWO&y0MO4 z3|8MAj^q{IK+TFn0fx4c1FiYgABW3Ba)~8+Fkr;|5aqo_!I1U(n?Tssxhv;U<{*p$ z2V3V#sonASM!3>Bzd$g}-U$WOcSo)EbEdcW@>RTy;QAjvIQNRp{1lYxab#(=mE$AT zN|1LK367Ci7NG9O>pjR*sYXz5vZz|ioy|cTevKc z=4mAKw$=&jFg-wvpPw*J zm&@o!6O7-L7(B0;XciTb6D_naz5+3@=_5ST2n+mzFZ5YZ2&aTc6ZWR&6jOMb+DSHv zI`wrm>qi5f?V6dE5n--OOG<0Sb^43%sMzx2mEIcV13Gz%-RT-gutiY?Ae*DLpzwfu z4Lsi+>*+T>^nIq5LcKtua}~FZHE*u~j}QUI-(55LBAJSW$n|04g!SzNsVB!5*kl2I z5QFoBTh$=R=UjHc&vMiVcLXNL`D;1Jo9sYmctwkK3ocUWq$(yg(=8R#?nw7Hhg314 z&m8A6x^r)~zPp;Bm5_b_fQ5Q9#m22ma<&|3!9uX<0>1qTR5+UYjbTIQ2U3kZ6p0oD zYoGS`{2Ha?z)&}fA98hH3Rz#uppqyTs23*{r7^armv)b58;=p4MjU*LX@mH6CtCD) z%u9jH{2Od1*S*FM*A1Q0QP0m!)VqMO9B6TZF3Z1*x+XoSxp3+h2R-yC>L(CtE0M)q z3zWT76D7C=jgYd;;BaV86Z`xS+YM(-?V#bgOW1PNdoJA<+IK9$cZ*EDTWmK5vHLU`x z?{0vdN*`032c`%J77?m6ns~~AFUzmP0|r)Pt144#1QgU~(sYMa!7E6aDn8>gg_a%q z92#;(YCf#5q1D5<0ha**9d|_tb6wtuz*C{i@6BP&14{kCN1TVUXH?5xu~7R|0YTq} z2uP3SDoQG#sh81>T5Zg2UpyJ5rIeP2WoRqBx)#l?(2~p>yA(fDK|hn10`^}Iz;%hN z@r(pU|`J_}b= zhE(nm7FJj@)-0uPC1`yT{>xvR0U<;-VP#E5Q4nf#K`mVgB!fE=0GRt;%_i638!6Q9!QX6d8Oc+{+oAc zSYSpp}TA^cxD?M0V1L)7%t4&}+Z3EvAch;410uAk8b zM!7mdkhx%(+{s9)cwA+D9FS{*!m@6>h62yBJd8W|_DT=(U?jkgLI2TAMOifb4U?tk zrt&xksmzb_3OcMt*704AA3x5C>4(j__-GS>Xb4$;3>mU|K)7P1?$E)glu}Z0^z}+h z{mpKS;5Gq1by?S*(kkt-7MTP!pe<^~9kG0}A4>zgEB$mFP zT(~n3%Eu@nLkoRGkE#ZDYVFd$fW+u`{i)Tz{3svI(aH%XCegES&t^%T$@ts0ZiDaQ z_-IHV$_ciz;$fi=N#;XUj$x%6{2MBIo@v%4^Qqx$?w{p_vCL7=ncBhHsV3xFds zNO1b+6^dasQnrd|$HBl$dS;#AS#yLYN#-VBfc(mJ?3E1t?P2wNX-g?_mFJ|q__&0+ z#mz#!hs1%&_^h&;&8}O5F_8L_5J4T|fkH;ppdyg`ydI?!WlHn?Koq;<8>J+C^vVLS~@&5%bke6KOvvct)MS zDmX;XvvI(mWY*lvf%eGydjFZ83}V#$!mW3e zNzkv^QpiZ0{pYDcofYj_J~ z%lW0xJY#>CBLz*-mDYL1V0c0hMiv%tt`7`}p&Dz6eiy>0{TYcp?`+p?0}>E((xqS>iP6c0}`O z>~(!MEK6U|-Qu#1wZ~*ZDc6o+nt{Igd&==oq2Q$rcukTSzWJ36sHX>+LCi8hN^Qk1 z*EnF>w}+EaOTKo2rrocQ6*XtvZ!Hanhq$T2Sj;*%;PLe&GQlY2y8*J@S%;BHRaKn} z)9NZgd?{Egd>b9md3O$^kK@aC0{Odq1bJ-8CB7)QdcdC;J_X8U#L%LHKs_X5ZY|sN zMw*b#`aHaI!&&CIdRtIIFdk*1gzwf%7q#v3@DBFHM(`UPmkAE@X>cVoVUUU6p)O~= zx~*WVvC&*F{T7*x;VhE_druO^Fx%lx+{rjR{-!jhraPUSL*o)x6bQ50EvD z?puUPZVhF1sZaN+cW)8AI5DC(FfT}#^#fkTS*D+_N+&jY)4bXjQtLAlZPX9!Xg-^( zv@&n~5BilJiu8A62~B*2a|&O_HGwRjG`GEdGfgED$n)Fc2ZzXFamonXXbFg&Ev(Im zjQ^ruS|{z2L&&4t`SeUew5sel{~W9@^r&3^^mr5ngQ3RZo9DERRqy*F-k;gUd7U?U zI7UtzQ$C$gA62!6iiy`1)VCyU^@6-Oc;2@AO5CpP`qLr_bm=I=$N5Ph4H1yr_B-cl5kAHMPgDJ5@3 z6{IHQlo0Eb!Lm`$`lcd063X|r;%#obps1g6PpJRv0HQzXFmjr8dLHM9(?mX@LvW4v z56z*SsOXQ?Sg}zm1AX!Gp9HQlv{;&D8;~FG=#=hZ1fl3wC-MPq0d_t3l*n@X5gen9w4Fx$BD-PV4SS2c{u?Xewee>z% zz7<=zLq+}RhCD!Q>T;U{=>`gC+6}trqTl-(;dp;q!rm+VoP|{DLcTh9x7!F((Co`U zgGmj!hRaiVmxQ9a9nf{?F)sAVBgu3bLfdkT>GyR9To~;vou8QSPM^H!omjb!T6%`= zByY|IY62g?+(lAB!nXy%63d*StOeJ{Whhx8MN8vqLh%ntHr~yyZ#9?bV=YM3Jtvt9 z?l7E+9g}+BTxM4Vdfj|gpVR3jW&}5u?qLMA9^j5GNyq^vD19H!f-kA&rJi_Snb1m8 z<|bO+Afv0-SY}Hqd5RV}qO(FRL#l?-TytYy`whtLPmFh|gZ}pEwa86)f))@Mg2^o*az#S%h4uRMls z?gQ7Czno}^`1mw$H+!9EPJF{G81HWbf4{ikaQ~kRn1HM7-farSM|trUuhu)K6dOBL z^r%lh+S`@ybo;0u za-S32ABci3ZT=qvZ6HIhXk-))T}iyD#Neptm%3D?Si#cz{;~;NtNr zDaz08^h~iKZb`(ua+L!##{KnBv1EQts>^Di$7Q9O)(J2X#gKn|Secxf-Q9o_<3ph# z3`eV;=r>BzB`=3-)qYtli4OB;XHq}HAo}}@hD^s4u3-bkP4u5U!eQqiTFsHTaCzSS zgLMm$=_6^F@X6Ox5RTi!uc(!mLVlGDpi6OX%`>zI_sz5&M(W)E=DQ0!=48K@-=6tm z_)PFrYQq#*NZQ*Tcv)Su;c*c4-`BZU*#PVkazzWAb{l<9j7!cPOhyMv$)OdCsh2-% zUyCovgS;-JK|_(Vo=-9MegQXCiT|nU0744tLHElx#*1z6}>$|QdZY$8@rq6NQ~}# zK=r!W^ECep(?)OuzVgLKYVpmqrv;|el};XN(AwBZ&khdzGmxzITIyY@W&a+w_*r2lUn`XG8Gcv0b}*Fx*DB{sWm2Lt=3 zXOGj9iM20YaPQLd5;1P~cp~c;Y^;23IMHfrcM#K4^#2`rgWegs-r|<1l~Db`bGLl+ z4Kd(1y*ogv0J}oAXS$TK%kZ}n%Ts)i@?mj!oB^PKwgctyl~(LehEO6&N$g^A|AQ;3 z4q7zxab#$T(WboHBfr>^%oXf8>GXxN;w%7YCAV@gPSOOk&3%|0?(5zEkLg!Jf5y7@ XtTzGY;2ym^00XEfXv){hT8I7*5)_rP literal 0 HcmV?d00001 diff --git a/YACOSWeb/WebContent/images/cc-download_manager-128x128.png b/YACOSWeb/WebContent/images/cc-download_manager-128x128.png new file mode 100644 index 0000000000000000000000000000000000000000..aeb63d311aa6776e2e721c48bdc23b4ea47a6990 GIT binary patch literal 11510 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 literal 0 HcmV?d00001 diff --git a/YACOSWeb/WebContent/stylesheets/base.css b/YACOSWeb/WebContent/stylesheets/base.css index 2515daa..cb9b4e6 100644 --- a/YACOSWeb/WebContent/stylesheets/base.css +++ b/YACOSWeb/WebContent/stylesheets/base.css @@ -467,5 +467,4 @@ textarea { .yacos_button:hover { background-image: url(../images/button_background_hover.png); } - /* @end */ \ No newline at end of file diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java index bcb3365..2ce3954 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java @@ -1,7 +1,5 @@ package org.yacos.web.PCmember.controller; - - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -47,10 +45,10 @@ public class ChoosePreferenceController extends SimpleFormController { List
    articleList=articleManager.getArticles(currentConferenceId); - getServletContext().setAttribute("articleList", articleList); + request.getSession().setAttribute("articleList", articleList); User currentUser = SessionService.getInstance().getCurrentUser(); - // TODO : mock object, replace with real user management + ArrayList preferencesList = new ArrayList(); Preference pref; for(Article article : articleList){ @@ -86,8 +84,9 @@ public class ChoosePreferenceController extends SimpleFormController { } Map model = new HashMap(); - model.put("message", "preference.ok"); - return new ModelAndView(new RedirectView(getSuccessView()), "model", model); + model.put("message", "done"); + + return new ModelAndView(new RedirectView(getSuccessView()), model); } diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceControllerOK.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceControllerOK.java deleted file mode 100644 index a45b4a6..0000000 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceControllerOK.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.yacos.web.PCmember.controller; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.SimpleFormController; - -public class ChoosePreferenceControllerOK extends SimpleFormController { - - protected final Log logger = LogFactory.getLog(getClass()); - - public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - - logger.info("Returning choosePreference OK view"); - - return new ModelAndView("choosePreferenceOK"); - } - -} \ No newline at end of file diff --git a/YACOSWeb/src/org/yacos/web/PCmember/form/FormPreference.java b/YACOSWeb/src/org/yacos/web/PCmember/form/FormPreference.java index c81b5d6..a0863fe 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/form/FormPreference.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/form/FormPreference.java @@ -2,7 +2,6 @@ package org.yacos.web.PCmember.form; import java.util.ArrayList; import java.util.List; - import org.yacos.core.article.Preference; diff --git a/YACOSWeb/src/org/yacos/web/author/controller/ManageArticleController.java b/YACOSWeb/src/org/yacos/web/author/controller/ManageArticleController.java index 37acef6..420700c 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/ManageArticleController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/ManageArticleController.java @@ -1,7 +1,6 @@ package org.yacos.web.author.controller; import java.io.IOException; -import java.util.ArrayList; import java.util.List; import javax.servlet.ServletException; @@ -14,7 +13,6 @@ import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.SimpleFormController; import org.yacos.core.article.Article; import org.yacos.core.article.IArticleManager; -import org.yacos.web.author.form.ArticleBean; import org.yacos.web.system.controller.NoConferenceSelectedException; import org.yacos.web.system.session.SessionService; @@ -23,40 +21,14 @@ public class ManageArticleController extends SimpleFormController { protected final Log logger = LogFactory.getLog(getClass()); private IArticleManager articleManager; - - /*private List listArticleBean; - - public List getListArticle() { - return listArticleBean; - } - - public void setListArticle(List listArticleBean) { - this.listArticleBean = listArticleBean; - }*/ public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException, NoConferenceSelectedException { logger.info("Returning manageArticle view"); - - //listArticleBean = new ArrayList(); List
    listArticle; listArticle = articleManager.getArticleOfAuthor(SessionService.getInstance().getCurrentConferenceId(), SessionService.getInstance().getCurrentUserLogin()); - - /*for (Article a : listArticle) { - ArticleBean ab = new ArticleBean(); - ab.setId(a.getId()); - ab.setMainAuthor(a.getMainAuthor().getFirstName() + " " + a.getMainAuthor().getLastName()); - ab.setSecondaryAuthors(a.getSecondaryAuthors()); - ab.setTitle(a.getTitle()); - ab.setTopic(a.getTopic()); - String fullUrl = request.getContextPath()+"/download.htm?articleId="+a.getId(); - ab.setURL_article(fullUrl); - ab.setState(a.getState().toString()); - - listArticleBean.add(ab); - }*/ return new ModelAndView("manageArticle", "listArticle", listArticle); } diff --git a/YACOSWeb/src/org/yacos/web/author/controller/SArticleControllerOK.java b/YACOSWeb/src/org/yacos/web/author/controller/SArticleControllerOK.java deleted file mode 100644 index 4e06376..0000000 --- a/YACOSWeb/src/org/yacos/web/author/controller/SArticleControllerOK.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.yacos.web.author.controller; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.SimpleFormController; - -public class SArticleControllerOK extends SimpleFormController { - - protected final Log logger = LogFactory.getLog(getClass()); - - public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - - logger.info("Returning submission OK view"); - - return new ModelAndView("submissionArticleOK"); - } - -} \ No newline at end of file diff --git a/YACOSWeb/src/org/yacos/web/author/form/ArticleBean.java b/YACOSWeb/src/org/yacos/web/author/form/ArticleBean.java deleted file mode 100644 index b97bf8c..0000000 --- a/YACOSWeb/src/org/yacos/web/author/form/ArticleBean.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.yacos.web.author.form; - -import java.util.ArrayList; - -public class ArticleBean { - - private int id; - private String title; - private String topic; - private String URL_article; - private String mainAuthor; - private ArrayList secondaryAuthors; - private String state; - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public ArticleBean() {} - - public int getId() { - return id; - } - public void setId(int id) { - this.id = id; - } - public String getTitle() { - return title; - } - public void setTitle(String title) { - this.title = title; - } - public String getTopic() { - return topic; - } - public void setTopic(String topic) { - this.topic = topic; - } - public String getURL_article() { - return URL_article; - } - public void setURL_article(String url_article) { - URL_article = url_article; - } - public String getMainAuthor() { - return mainAuthor; - } - public void setMainAuthor(String mainAuthor) { - this.mainAuthor = mainAuthor; - } - public ArrayList getSecondaryAuthors() { - return secondaryAuthors; - } - public void setSecondaryAuthors(ArrayList secondaryAuthors) { - this.secondaryAuthors = secondaryAuthors; - } - -} diff --git a/YACOSWeb/src/org/yacos/web/system/session/SessionService.java b/YACOSWeb/src/org/yacos/web/system/session/SessionService.java index 2554917..f20b474 100644 --- a/YACOSWeb/src/org/yacos/web/system/session/SessionService.java +++ b/YACOSWeb/src/org/yacos/web/system/session/SessionService.java @@ -25,27 +25,27 @@ import org.yacos.core.users.User; */ public class SessionService { private static SessionService instance = new SessionService(); - + protected static ServletContext servletContext = null; protected static HttpServletRequest request = null; - + private IConferenceManager conferenceManager; private IUserManager userManager; - + private User currentUser; private Conference currentConference; private int nbUserConferences; - + private SessionService(){ } - + public static SessionService getInstance(){ if(instance == null){ instance = new SessionService(); } return instance; } - + /** * Init method to be called at filter time * Makes the sessionAttributes available in the request context @@ -66,33 +66,34 @@ public class SessionService { request.setAttribute("currentUser", getCurrentUser()); // Put the current roles for this user //request.setAttribute("nbUserConferences",getNbUserConferences()); - + } catch (NamingException e) { // TODO Auto-generated catch block e.printStackTrace(); } } } - + public int getNbUserConferences() { if(nbUserConferences == -1) { setNbUserConferences(); } - + return nbUserConferences; } public void setNbUserConferences() { int nb = conferenceManager.getConferences(getCurrentUser()).size(); this.nbUserConferences = nb; - request.setAttribute("nbUserConferences", getNbUserConferences()); + //request.setAttribute("nbUserConferences", getNbUserConferences()); + request.setAttribute("nbUserConferences", this.nbUserConferences); } public void setConferenceManager(IConferenceManager conferenceManager) { this.conferenceManager = conferenceManager; } - + public IConferenceManager getConferenceManager() { if(conferenceManager == null){ Context context; @@ -105,11 +106,11 @@ public class SessionService { } return conferenceManager; } - + public void setUserManager(IUserManager userManager) { this.userManager = userManager; } - + public IUserManager getUserManager() { if(userManager == null){ Context context; @@ -122,7 +123,7 @@ public class SessionService { } return userManager; } - + /** * Gets the current conference Id * Additionally, put the current conference object in the request context @@ -135,7 +136,7 @@ public class SessionService { Integer confId = (Integer) WebUtils.getSessionAttribute(request, "currentConferenceId"); return confId; } - + /** * Sets the current conference id * @param request The current HTTP request object, necessary for session operations @@ -148,7 +149,7 @@ public class SessionService { // Refreshing user credentials refreshAuthentication(); } - + /** * Sets the current conference using a conference object * @param request The current HTTP request object, necessary for session operations @@ -158,7 +159,7 @@ public class SessionService { setCurrentConferenceId( c.getId() ); currentConference = c; } - + /** * Gets (if necessary) and returns the current conference of the session * @param request The current HTTP request object, necessary for session operations @@ -166,21 +167,23 @@ public class SessionService { */ public Conference getCurrentConference(){ Integer id = getCurrentConferenceId(); - + // The currentConference can be out to date : force the update if(currentConference != null && id != currentConference.getId()){ currentConference = null; } - + if( currentConference == null && id != null ){ currentConference = conferenceManager.getConference(id); } - - if (isUserLogged()){setNbUserConferences();}; - + + if (isUserLogged()) { + setNbUserConferences(); + } + return currentConference; } - + /** * Gets the current user login from the session * Additionally, puts the current User object in the request context @@ -192,7 +195,7 @@ public class SessionService { // Retrieve the login from the acegi security session return SecurityContextHolder.getContext().getAuthentication().getName(); } - + /** * Get (if necessary) and returns the current user object * @return The current User @@ -200,12 +203,12 @@ public class SessionService { public User getCurrentUser() { // Retrieve the login from the session String login = this.getCurrentUserLogin(); - + // The user can be out to date : force the update if(currentUser != null && (! currentUser.getLogin().equals(login)) ){ currentUser = null; } - + // Check if the user object is already in cache if(currentUser == null || (currentUser.getLogin().equals(login)) ){ // Checks login for validity @@ -218,7 +221,7 @@ public class SessionService { } return currentUser; } - + /** * Returns whether the user is logged (is there a current User for this session) * @return true if there's a current user in the session, false otherwise @@ -226,7 +229,7 @@ public class SessionService { public boolean isUserLogged(){ return getCurrentUser() != null; } - + /** * Puts an object in the session * @param name The name of the attribute in the session @@ -235,7 +238,7 @@ public class SessionService { public void setSessionAttribute(String name, Object attribute){ WebUtils.setSessionAttribute(request, name, attribute); } - + /** * Retrieves an object from the Session * @param name The name of the attribute to retrieve @@ -248,27 +251,27 @@ public class SessionService { public void refreshAuthentication(){ refreshAuthentication(null); } - + public void refreshAuthentication(String newPassword) { // First step : remove user from the cache DaoAuthenticationProvider authProvider = (DaoAuthenticationProvider) RequestContextUtils.getWebApplicationContext(request).getBean("daoAuthenticationProvider"); UserCache userCache = authProvider.getUserCache(); - + if(userCache != null){ userCache.removeUserFromCache(getCurrentUserLogin()); } - + // Second step : Refreshing user credentials Authentication currentAuthentication = SecurityContextHolder.getContext().getAuthentication(); if(currentAuthentication instanceof UsernamePasswordAuthenticationToken){ - + if(newPassword != null){ // Setting the new password in the authentication token currentAuthentication = new UsernamePasswordAuthenticationToken(currentAuthentication.getPrincipal(),newPassword); } - + SecurityContextHolder.getContext().setAuthentication(authProvider.authenticate(currentAuthentication)); } - + } }