From 25c6db06a2c9d67f043ca0d057f9963df6721715 Mon Sep 17 00:00:00 2001
From: Frederic Debuire <frederic.debuire@gmail.com>
Date: Fri, 22 Feb 2008 23:06:05 +0000
Subject: [PATCH] =?UTF-8?q?Modification=20de=20la=20validation=20:=20mise?=
 =?UTF-8?q?=20en=20page=20et=20test=20d'erreur=20Modification=20de=20l'?=
 =?UTF-8?q?=C3=A9valuation=20:=20mise=20en=20page,=20ajout=20d'image=20pou?=
 =?UTF-8?q?r=20chaque=20=C3=A9tat=20de=20l'article.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/classes/messages.properties       |   6 +-
 .../WEB-INF/jsp/errors/404error.jsp           |   2 +-
 .../WebContent/WEB-INF/jsp/evaluation.jsp     |  61 ++++++++--------
 .../WebContent/WEB-INF/jsp/listEvaluation.jsp |  50 +++++++------
 .../WEB-INF/jsp/submissionArticle.jsp         |   2 +-
 .../WEB-INF/jsp/validateArticle.jsp           |  41 +++++++----
 YACOSWeb/WebContent/images/cancel.png         | Bin 0 -> 1518 bytes
 YACOSWeb/WebContent/images/cancel32.png       | Bin 0 -> 2212 bytes
 YACOSWeb/WebContent/images/ok.png             | Bin 0 -> 1019 bytes
 YACOSWeb/WebContent/images/ok32.png           | Bin 0 -> 1518 bytes
 .../controller/ValidateArticleController.java |  14 ++--
 .../ValidateOrRejectController.java           |  66 ++++++++++--------
 12 files changed, 140 insertions(+), 102 deletions(-)
 create mode 100644 YACOSWeb/WebContent/images/cancel.png
 create mode 100644 YACOSWeb/WebContent/images/cancel32.png
 create mode 100644 YACOSWeb/WebContent/images/ok.png
 create mode 100644 YACOSWeb/WebContent/images/ok32.png

diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
index 5ca8d88..f7a101f 100644
--- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
+++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
@@ -246,7 +246,7 @@ evaluation.headPage=Here is a report of the evaluation
 evaluation.titleArticle=The title of article is  
 evaluation.note=The note for the criterion
 evaluation.thisArticle=evaluate this article
-evaluation.choose=Choose a article to evaluate
+evaluation.choose=Choose an article to evaluate
 evaluation.help=Choose an article that you would like to evaluate 
 
 invitation.send=Send an invitation
@@ -273,8 +273,8 @@ delegateArticles.help=Click to an article to delegate it to the referees
 #valider les articles 
 validate.download=download the article
 validate.report=View the result of the evaluation
-validate.validate=validate
-validate.reject=reject
+validate.validate=Validate
+validate.reject=Reject
 
 #report des evaluations
 report.headPage=Here is the list of the evaluation
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp
index 6af924b..0464274 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp
@@ -25,7 +25,7 @@
 		<h1>
 	<a href="main.htm">
 
-	<img src="./images/404.jpg" alt="404" /><br/>
+	<img border="0" src="./images/404.jpg" alt="404" /><br/>
 	
 	
 	
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp
index f04719a..92fd08d 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp
@@ -6,39 +6,44 @@
 
 <h4 class="title"><fmt:message key="evaluation.title"/>: ${evaluationForm.title}</h4>
 
-<form:form method="post" commandName="evaluationForm">
+<form:form method="post" commandName="evaluationForm" id="account_data">
+
+<p class="legend">Rating</p>
+<fieldset>
 
-	<table>
     <c:forEach items="${evaluationForm.simpleRatings}" var="criterion" varStatus="j">
-    
-    <tr>
-        <td>${criterion.name}</td>
-        <form:hidden path="simpleRatings[${j.index}].name"></form:hidden>
-         <td>
-         <c:forEach var="i" begin="${criterion.min_rating}" end="${criterion.max_rating}" step="1">
-          <c:out value="${i}"/>
-          <form:radiobutton path="simpleRatings[${j.index}].value" value="${i}" />
-         </c:forEach>
-         </td>
-	</tr>
+    <div>
+        <form:label path="title">${criterion.name}</form:label>
+		<form:hidden path="simpleRatings[${j.index}].name"></form:hidden>
+		<form:label path="simpleRatings[${j.index}].name"><form:select path="simpleRatings[${j.index}].value">
+        	<c:forEach var="i" begin="${criterion.min_rating}" end="${criterion.max_rating}" step="1">
+          		<form:option value="${i}"></form:option>
+          	</c:forEach>
+		</form:select></form:label> 
+    </div>
+
    </c:forEach>
    
-    <tr>
-    <td><fmt:message key="evaluation.commentAuthor"/></td>
-	<td><form:textarea path="commentAuthor"/></td>
-	</tr>
+</fieldset>
+
+<p class="legend">Commentary</p>   
+<fieldset>   
+    
+    <div>
+    <form:label path="commentAuthor"><fmt:message key="evaluation.commentAuthor"/></form:label>
+	<form:textarea path="commentAuthor" cols="60" rows="10"/>
+	</div>
 	
-	<tr>    
-    <td><fmt:message key="evaluation.commentPCMember"/></td>
-	<td><form:textarea path="commentPCMember"/></td>
-    <tr>
-   </table>
-   
-        
-  
-   <input type="submit" name="submit" value="<fmt:message key="button.OK"/>"/>
+	<div>    
+    <form:label path="commentPCMember"><fmt:message key="evaluation.commentPCMember"/></form:label>
+	<form:textarea path="commentPCMember" cols="60" rows="10"/>
+    </div>
+
+</fieldset>
+
+<input type="submit" name="submit" value="<fmt:message key="button.OK"/>"/>
 
 </form:form>
 
-  </body>
-</html>
+</body>
+</html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp
index 2defb95..b7aa859 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp
@@ -1,4 +1,4 @@
-   <%@ include file="/WEB-INF/decorators/include.jsp"%>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
 
 <html>
 <head></head>
@@ -12,29 +12,39 @@
 </p>
 
 <c:forEach items="${listArticle}" var="article">
-	<ul class="article">
-		<li class="title">Title: <a href="<c:url value="${article.URL_article}"/>">${article.title}</a></li>
-		<li class="author">Author: <b>${article.mainAuthor.firstName} ${article.mainAuthor.lastName}</b></li>
-		<li class="topic">Topic: <b>${article.topic}</b></li>
-		<c:choose>
-		
-		<c:when test="${article.state eq 'SUBMITED'}">
-		<li class="article_url"><a title="Click to evaluate" href="<c:url value="evaluation.htm?id=${article.id}"/>"><img src="./images/cc-kedit-128x128.png" alt="Click to evaluate" /></a></li>
-        </c:when>
+	<div style="border: 1px solid orange;">
+		<table style="width: 100%">
+			<tr>
+				<td colspan="2" align="center">
+					<a title="Download" href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>"><b>${article.title}</b></a> by ${article.mainAuthor.firstName} ${article.mainAuthor.lastName}
+				</td>
+			</tr>
+			<tr>
+				<td align="left">
+					Topic: <b>${article.topic}</b><br/>
+					Abstract: ${article.abstractText}
+				</td>
+				<td align="right">
+					<c:if test="${article.state eq 'SUBMITED'}">
+						<a title="Click to evaluate" href="<c:url value="evaluation.htm?id=${article.id}"/>">Evaluate <img src="./images/button_follow_32x32.png" alt="Click to evaluate" /></a>
+        			</c:if>
         
-        <c:otherwise>
-		<li class="article_url"><a title="Click to modify evaluation" href="<c:url value="evaluation.htm?id=${article.id}"/>"><img src="./images/cc-button_ok-128x128.png" alt="Click to modify evaluation" /></a></li>
-        </c:otherwise>
-        </c:choose>
+        			<c:if test="${article.state eq 'EVALUATED'}">
+						<a title="Click to modify evaluation" href="<c:url value="evaluation.htm?id=${article.id}"/>">Modify the evaluation <img src="./images/cc-kedit-32x32.png" alt="Click to modify evaluation" /></a>
+        			</c:if>
         
+        			<c:if test="${article.state eq 'REJECTED'}">
+						Rejected <img src="./images/cancel32.png" alt="This article has been rejected" />
+        			</c:if>
         
-        	
-	</ul>
-	<br />
-	<hr />
-	<br />
+        			<c:if test="${article.state eq 'ACCEPTED'}">
+						Accepted <img src="./images/ok32.png" alt="This article has been accepted" />
+        			</c:if>
+				</td>
+			</tr>
+		</table>
+	</div>
 </c:forEach>
 
-
 </body>
 </html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
index cdd27e5..1a8a99d 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
@@ -47,7 +47,7 @@
 		<span class="formError"><form:errors path="theme" /></span>
 	</div>
 	<div>
-		<form:label path="theme"><fmt:message key="form.submission.article.abstractText" /></form:label>
+		<form:label path="abstractText"><fmt:message key="form.submission.article.abstractText" /></form:label>
 		<form:textarea path="abstractText" cols="60" rows="10" />*<br />
 		<span class="abstractText"><form:errors path="theme" /></span>
 	</div>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
index ee9cde9..555fce7 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
@@ -2,22 +2,37 @@
 
 <html>
 <head></head>
-<body>
-  <h4 class="title">NO NAME</h4>
-  <br>
+<body>
+<h4 class="title">Validate an article</h4>
+
+<p class="formHelp">
+  	Choose whether you want to validate an article (i.e. the article will take part in the conference) or reject it. 
+</p>
+
 <c:forEach items="${listArticleValidate}" var="article">
-	<ul class="article">
-		<li class="title">TiTle: ${article.title}  </li>
-		<li class="author">Author: ${article.mainAuthor}</li>
-		<li class="topic">Topic: ${article.topic}</li>
-		<li class="state">State: ${article.state} <a href="<c:url value="validateOrReject.htm?value=valide&id=${article.id}"/>"><fmt:message key="validate.validate"/></a>
-	                                             <a href="<c:url value="validateOrReject.htm?value=reject&id=${article.id}"/>"><fmt:message key="validate.reject"/></a> </li> 
-		<li class="article_url"><a href="<c:url value="${article.URL_article}"/>"><fmt:message key="validate.download"/></a> <a href="<c:url value="listReport.htm?id=${article.id}"/>"><fmt:message key="validate.report"/></a></li>
-	
-	   
-	</ul>
+	<div style="border: 1px solid orange;">
+		<table style="width: 100%; text-align: center;">
+		<tr>
+			<td><b>${article.title}</b></td>
+			<td>${article.mainAuthor.firstName} ${article.mainAuthor.lastName}</td>
+		</tr>
+		<tr>
+			<td colspan="2">State: ${article.state}
+			<a href="<c:url value="validateOrReject.htm?value=valide&id=${article.id}"/>">
+			<fmt:message key="validate.validate" /><img	src="./images/ok.png" alt="Validate" /></a> 
+				<a href="<c:url value="validateOrReject.htm?value=reject&id=${article.id}"/>">
+				<fmt:message key="validate.reject" /><img src="./images/cancel.png" alt="Reject" /></a></td>
+		</tr>
+		<tr>
+			<td><a title="Download"	href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>">Download<img
+				src="./images/cc-download_manager-32x32.png" alt="Download" /></a></td>
+			<td><a href="<c:url value="listReport.htm?id=${article.id}"/>"><fmt:message	key="validate.report" /></a></td>
+		</tr>
+		</table>
+	</div>
 </c:forEach>
 
+
 <a href="<c:url value="main.htm"/>">Home</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/images/cancel.png b/YACOSWeb/WebContent/images/cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f0c98b7d98da3ca38d36f581de0fed5d55b5f95
GIT binary patch
literal 1518
zcmV<K1rhp*P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000HGNkl<ZNQr%w
zZERat8OML;Ui;cf?6{8YxN)6sBx#ch5!QumnbJya(KZ-r(bla3RRV-2q@p22hgOBD
z+cYW|L7K#ep}_~<R&6lWZ51FfX%iYnAi>bIp*2afbxD&rO`P~GvG4mme7Gl*L9i=b
z-E)tg=lTE7|9Lq=00t3kJSKpfflnlo?9>E$qd_O&0}Y@CqyY&e0S&N#Vm`||(%>I!
zCEfxq0S2H6fkxXSRWP^J8gW~#g0J>I>XCqNTOGb_9SHu1{eJ)iA*0^UKJkO;@l#)4
zb|4;nL|_ScKz!_$)`4$7a><4<|Gxo3!w}bmtOu(fd*A^I4}KFJOb=rJ?-V}Jg38`g
zry0EK4m5bvgwbuX5)f_nnITyJ%jDzahlW9q(p<U9>yr-?gIE)s8qlMhJ3~U1Bafa-
zrv^sAw(%-u#?L;)KRy2@;BBJ~V4&EQe*d-mPB7e)r?tL@FCn@623mHV*PeP3OClNy
zzzad@cYp00-QDRNo7Y#-fzF-`b=zd{=g+WVZcYgJs{ok1>!keN)c4`1Pt*AO->{7s
zQV4_)q_Vv@*t~l21y%z@5731Ay~pnFPG|<TY6a>02q3O$Bohh96?v@I;E9Vr69Qm7
z*7N0+Wc(KwMn@T&dymDyL+TL_AQ9~7Ob~SHyd(W}vuW0DGCGDj1E_5^KTNj<6s4q+
zPP2b@mVtQpxj)yI&jN6yy8v(;kRR;7Ra()AoEFHLh%RTMy1c9*mqE&>o|ba*ak&I?
zS`%_6s>_*(E@vZ}YzXA~&OVum8WK1I5Em*3pGo)g$Lb<cI6iE|UVJIvhp{-%)wVhg
zfUNpf0KKhTb3j+DgOf7gO~;<J;YollO$+^f5r#3~Lg3i<ow{D4(O1L=mVvSgIt^S=
z>oTxH*vV#R7pIZb9sA6H3JxH)JGrhlnqh@p@LcEfKQ5Ok6#B^lj$$s<8>k*g0O?4S
zXI+oFZ9SBMsrJUSw@><pa5?C@90hIxx?#2&_-}pkz@aa8X@a$lbxal1RgM-=%;fO)
zjPP#h+9M+{H4Ur*Tidc~8shT4{j7g*nRhK4SFv3L`lFGVJNs`OUR;=G&i9A{5#{JB
zkSv1H!6E*%IA2|M+@AiB95EoSB#Ny29$QjkwXxe1>u4P4$s}j4zDHFhG1`{YZJC-#
z=H8#<P@$N<R4L1vWeZ;si7PwJl@d=%JjFgA?`Ry(<dRD(O91R5?A`>B2X+&ViIn>H
zfl_ISPxs`=$K$dEhNWUTfELIA-}iBVKEtRUOr?^g(lr7gLpb*nYCZ9(amMdH#x9^k
zfn>tMV7au!!5wJ|v6$^Z%mV@`5wG5`m)gP=^h8%}uMta?D-~Q7G^VN`4h&_pylfcw
zn&3p>Ghez+O-W{}#2P?vF3)spi}_|V6@!N6yEY>aek(Zsqi0gpN(G<r)=DZVvcSIL
zE`DvA>?@T{?k|@n&Tmv192{VmvPmkR04SGNIXre7ciexn?g9F#TMyyQ{3})Z-EVJC
zMxsP4i%#XZ11R(td9L1Icx&rnsq>S#5m`){?%S_h))yuQ2QW4^LakMD6X^`=<z=k$
z>hIU<_2)GJb7AiE)s?kJTdu?I-d>W5dA_f}bJZH7o1151@Iy@qgwW97m77iT-d`;&
zk{TIir;>DcE{_+uELG~y&R)BA^utaTx{d+g-E6kb);4Pt_I;exp(FgJQDtmv>r7N*
zN(exWa1k<o`8LZuetv#|<lq3s-d<{Mi+a8BOC7$Xu{|n;Kxm<p0q2^g^O$|?b6o7|
zV!UZiMqsM_+H1c)1-x{-Wu17zaq#ZBhgNO#d=$R2JyL`a=wBTeAy{3&Y?<2$d*ct&
zGe_^leZ^TVe+L192EGKT38E1l%khaQ-F3LUC!1<qoW3$t+-w}S0aJvd#M3nX4c0Ji
U*ntJqA^-pY07*qoM6N<$g2$cMb^rhX

literal 0
HcmV?d00001

diff --git a/YACOSWeb/WebContent/images/cancel32.png b/YACOSWeb/WebContent/images/cancel32.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9a291171e35cfac828da05a7ba72458bdb00e52
GIT binary patch
literal 2212
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

literal 0
HcmV?d00001

diff --git a/YACOSWeb/WebContent/images/ok.png b/YACOSWeb/WebContent/images/ok.png
new file mode 100644
index 0000000000000000000000000000000000000000..696f94461456b2d8d93be047f1fb6df75307af95
GIT binary patch
literal 1019
zcmV<X0|fkuP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000BRNkl<ZNQu>z
zYfPI}9LAsXw)XPUcBS+Jv<w*5p@U3;MW?g4EN(1*aLMMClx0g6^@~fEB_<}@lBtQt
zNa93Lyks*lrvqUH+5vT_Y%)4f#%{vsOYM!)3+oC9!rLCdxMgk?=Pn=iB<IsP=lA^o
z=bt=>P)cz(#oSf;J!K%PAthP6wLfOPtJ2?b1NL)LoEOgTZP;?el*<^c($`4l)lEw2
zZ7u0%C@FZ$81Fi7r#laAr>%oWsMO4y5p6;yrS$eXNU0@7x&FM9A8x8<EN7cA5bVSA
z2R7pEigyac^AekQJyG7WK}t0#&KX~F>Z6xx1eW1O3{L-opC?Zsk;%j6YJr?l3gYwE
z%|LfZqEze^)oKq)iWY*ipOE6k6FH83=4!^`IgE3O0XX;`NOFbH5j8G!j5?`sZXIu@
z(W?e*Es^tHG#`7Vdz<=lh9zY`S)L4@T1QH9V!4j0Ej3K*coT*bLpVEs8fkhZlpz(y
zY!f4qsWFrP+lUYNy8}(7Sgwoeni^kdDdqo|gWY^wzbKk&Nv&rJuZ3qcutixRWADeC
zKV{lOZSe3ejPSofo34S>Er+Kq%n?Ci^^BGJuiRmzyNSZc7h2wbwsH-P1Fkt2y2rZU
z*fy|O5mQ<9-^mI9Ag3j@NEgUHRb{SWzMrtcPd(u1MQGABz_17-79YpR5~f)j^<G;P
zL;r+YM&yOf-Uj>-?SxP)z%(<3j&UoxH}@GZBx--6bNQNr@CwJi@+zk5awh`B2R9jo
zCS3!57`Skh<3#xh(`+O4UH_!a?0b}pAyOV4m<}KHwZM9*83{ogalt&Sk!GCO-j^vG
zRoizxw@1)Dbqqm)A3lKx8m$^L7kLb}4msJ?)HL<Mjc@=USJE_lr*^$W#MUX-N>m1I
z79N$af?TLToZ+!j@g(dq8-g?dSKJ9!Dn-y4Mb8&~oU-h`Qul_KHyQjN1^^&?gOtg{
zin@n4E=yxoQam7f2pJ+h5+sfg0`Sn^ks@W`bqCQ?+sEZ>(3tvHIg?hN)BphFm1JE?
zOj%!QemqT*E`*AzArs0GBmuBu798h6&zJq&BjrX@`-8m;!hs}VH@SnhCzi~-eEe%i
zNH{40BO{m=Pr)EIV9XUp|A8~kr(a)rQ}Cn)01&L0?O+R;3VYp85y>SvmXSjE-C_Lt
z)p>5~t{0!G*S6gh9Kgb9x}tk&+0x3q$g8Kf()_*mJHMg(_5U|*|MS4wbB{e^cr)YV
p9=ap@R^t4IA>V1;JAd-O=`XApF7w!t>5>2d002ovPDHLkV1kA4;THe^

literal 0
HcmV?d00001

diff --git a/YACOSWeb/WebContent/images/ok32.png b/YACOSWeb/WebContent/images/ok32.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab86df2f5872b0126a27b09d5e711db515d4e301
GIT binary patch
literal 1518
zcmV<K1rhp*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000HGNkl<ZScT=+
zeQXnT9LMp`@9uiP>$Tmw2iCFe=4e6OSa}o((1hRv0i6W?5DkW?(Fkfx{6~!vgNc6;
zC5G@INVhRiL?9THASxn4Kv>z6o23QT0UKjX+O6B#Zg<!F`3C_(7#qlg3E$-R-~I0W
z%01+AgfWKuIoy4%KQI8>XGFYjfD|uLdQae(Yen|Zdk(Ob5=A&IRc?BFll!3yBb!Gr
zcTKow09zSRgeK}MU9=%P<Zr}d)28!$SUMuVNv=WM6@aab<ntlwD_vCXsHv>QUurwf
zb+kaV@d6(ef2RxnLELeG%}W%%kye&2DtA;Lt3{U)MZ$<<U*lfXU8u(pm)(>m*$>mF
z$+$ZXu&pBsAEG|*;xb2dO*Oh%6bZzz|J*M)qc?-g0FcFy%_*W0<GSfALT(7i-D=}<
zx2E*_>fA8?IZ?PKlh6A`nWNfYg>E5=1dZcB=RTYfnjz)@mK+I|h73HM>nfJ4d{f^Z
z#)N;LD0_?99IrAq8^p-Vf&5(S{CH@fcxo9@$QhH*`&OBws<9G1v<H2x7l+z^LyOP?
zIg5u`kdgdJfJlVmgMkCV?p<mU0Lazfg0ynZ9BW`({7Zv#B+iVH%kurw!+c42q2APA
ze8^@|(M}NG`o*P=>a)iXOU9tGJ{%1n#<@f@BuZfxWJI<n5O3`%CL#&;e6Q=5_g?|n
zR}iT;gl`TmIWniGrxO;=2D?2S?q!93Td`1b@dfQVMDBL0(ibp%YhPRMsB5i3EE$7l
zs5sVn6m7ldK&4CZ)-NOIYVLAFWP!vkreA#y!We_&6WN>|9=c`a>#OFdstUq5#Pk>h
zo=3Jl2am1v`0ZollGbNqR}cj|)0E!h$;vgauFL+Ttqutz29>F(?W)2B^*ku0kT?k;
zZyTcR9mO1nVEnsl;{ZUc9}$yy*1EO)-3@c8D1s0UomvMpra^}WffrygS@B}|0)NK1
zl#<Y#aMOt0SxVfm`&PcZ+Tp+0fP@i;1`YK+HE7o^K%x|sGvm*dO^C)LZeBznw(<Hn
z0B}r$%z<<HnvdY)h9&UF{(wm|!QhifaynwH2a#kL6|a0<6s?bcH|giX1=d53x;3w^
zbp)fwq46r1iQ$CqN4L-gd#W9FOB#-Q&md}!xJ4)FHx2;2X(}|w(9GIaU-)U4%W2)&
zwGBMaBhRY9;0)+QhelK+NDR-9U6{2m^y|D&7cQ6UyK12k6-hpclX?JA(gBNXfmO1i
zYE1yq)QfJZfCQuO8~w(wc?d@?&G*<k(kn8jraI5(oW^j=Bbc7?I4pt{y(|Hp=n#ki
zi(x|>-vR~(ooG0z1`sjApdy9DOE|Qq7TvapTYQKG&(BY2H;Z2b0D#<g(x&NQY;r!S
z3^R=)FcUK-rA$K}RiF|TI&=`8Kw~O&q9LT8L?<E;g-h}M-b$$HF}JLkg29<>1IDid
z0D%1i!K1dbjblsP!?MQNp(a&0=?Dy$MuO*fXhcJj=s0aOB8m=BfkNad_EsDQ$xFJ^
zvn;_QlLLc_-w*%*_T`+X?-Z$+@Z>nBYepUtdK{^|9R=cW$efI`tO;GD6I7ruaUyn?
z?T1vzyK^!!gFhA>9dx{3003l`n>=wJDkjaE;2br3IQsNn2%HErXNJo4fpQcgD0Y<o
zfK<2aF38IbZp;1Ymf|-B06_k?DbqUkX`3cKHGbIS*`uLB2L~Q9WKbqyW9c?zPt0(S
zaOMZUux-8N_<#Ta81-|Wr)77f!ZUY@bLR9J000xCSXWk#;;BXMqC(fHC0N#bJ8=L2
zV{E`RrLxeI_MSB~Z%+x^+~;MFmX2Ys9e=5K2m6W+X8+CBpbwncFxiv+Vdm*ctH-lv
z0#6igV5|OfoG~`=Ex0_hf>VfDmZx$==qSihLd!Yt?O*n*X3&7UH4nzG+5Z~wHz#We
UggAPbj{pDw07*qoM6N<$f})Gi!vFvP

literal 0
HcmV?d00001

diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateArticleController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateArticleController.java
index e1a5954..b389e44 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateArticleController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateArticleController.java
@@ -1,11 +1,11 @@
 package org.yacos.web.PCmember.controller;
-import java.io.IOException;
-import java.util.List;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 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;
@@ -26,16 +26,14 @@ public class ValidateArticleController extends SimpleFormController {
             throws ServletException, IOException{
 		
         logger.info("Returning validateArticle view");
-        List<Article> listArticleValidate;
+        List<Article> listArticleValidate = new ArrayList<Article>();
         try {
 			listArticleValidate = articleManager.getArticles(SessionService.getInstance().getCurrentConferenceId());
-			 request.getSession().setAttribute("listArticleValidate", listArticleValidate);
 		} catch (ConferenceDoesntExistException e) {
 			e.printStackTrace();
 		}
-       
-
-        return new ModelAndView("validateArticle");
+		
+        return new ModelAndView("validateArticle", "listArticleValidate", listArticleValidate);
     }
 	
 	public IArticleManager getArticleManager() {
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateOrRejectController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateOrRejectController.java
index a406069..596022f 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateOrRejectController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateOrRejectController.java
@@ -9,6 +9,7 @@ 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.ModelAndViewDefiningException;
 import org.springframework.web.servlet.mvc.SimpleFormController;
 import org.springframework.web.servlet.view.RedirectView;
 import org.yacos.core.article.Article;
@@ -17,42 +18,51 @@ import org.yacos.core.article.Article.State;
 
 public class ValidateOrRejectController extends SimpleFormController {
 
-    protected final Log logger = LogFactory.getLog(getClass());
-    
-    private IArticleManager articleManager;
+	protected final Log logger = LogFactory.getLog(getClass());
+
+	private IArticleManager articleManager;
 
 	public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response)
-            throws ServletException{
-		
-        logger.info("Returning ValidateOrReject view");
-        String id=(String)request.getParameter("id");
-        Article art=articleManager.getArticle(Integer.parseInt(id));
-        String value=request.getParameter("value");
-        if (value.equals("valide"))
-        {
-        	
-				art.setState(State.ACCEPTED);
-		 }
-        else if (value.equals("reject"))
-        {
-        	
-				art.setState(State.REJECTED);
+	throws ServletException{
+
+		logger.info("Returning ValidateOrReject view");
+		String articleId = request.getParameter("id");
+
+		try {
+			Integer id = new Integer(articleId);
+
+			Article a = articleManager.getArticle(id);
 			
-        }
-        
-        try {
-			articleManager.updateArticle(art);
-		} catch (UndeclaredThrowableException e) {
-			e.printStackTrace();
-			System.out.println(e.getUndeclaredThrowable().toString());
+			if (a == null)
+				throw new ModelAndViewDefiningException(new ModelAndView("404error"));
+			
+			String value = request.getParameter("value");
+			
+			if (value.equals("valide"))	{
+				a.setState(State.ACCEPTED);
+			}
+			else if (value.equals("reject")) {
+				a.setState(State.REJECTED);
+			}
+			else
+				throw new ModelAndViewDefiningException(new ModelAndView("404error"));
+
+			try {
+				articleManager.updateArticle(a);
+			} catch (UndeclaredThrowableException e) {
+				e.printStackTrace();
+			}
+		}
+		catch (NumberFormatException e) {
+			throw new ModelAndViewDefiningException(new ModelAndView("404error"));
 		}
 		return new ModelAndView(new RedirectView("validateArticle.htm"));
-    }
-	
+	}
+
 	public IArticleManager getArticleManager() {
 		return articleManager;
 	}
-	
+
 	public void setArticleManager(IArticleManager articleManager) {
 		this.articleManager = articleManager;
 	}