From 5a503be01260e41ecde7fc74af17217b4d43b7fd Mon Sep 17 00:00:00 2001 From: Jialin Wang Date: Mon, 21 Jan 2008 21:14:42 +0000 Subject: [PATCH] modif d'evaluation Policy failures: Code warning - failed on resource EvaluationController.java. Reason: ArrayList is a raw type. References to generic type ArrayList should be parameterized, line 83 - failed on resource EvaluationController.java. Reason: Type safety: The expression of type ArrayList needs unchecked conversion to conform to ArrayList, line 8 Override reason: --- .../WEB-INF/decorators/usermenu.jsp | 1 + .../WebContent/WEB-INF/jsp/evaluation.jsp | 45 +++++++------------ .../controller/EvaluationController.java | 26 +++++------ 3 files changed, 27 insertions(+), 45 deletions(-) diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp index 5c4094a..aca8821 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp @@ -13,6 +13,7 @@
  • ">
  • ">
  • ">
    • +
  • ">
    • diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp index b9f58f8..bec6794 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp @@ -1,43 +1,32 @@ -<%@ include file="/WEB-INF/jsp/include.jsp"%> +<%@ include file="/WEB-INF/decorators/include.jsp"%> + + - - - - - <fmt:message key="title"/> - - + - -
    -
     
    -
    - - -
    +

    - + - + - - - - - - - + @@ -53,7 +42,7 @@
    ${criterion.name}${i} + + + + +
    - + "/>     @@ -61,10 +50,8 @@ ">Home -
    -
    -
     
    -
    + + diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java index 9f99893..28a21d5 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java @@ -42,22 +42,16 @@ public class EvaluationController extends SimpleFormController { conferenceManager.addConference("myTitre", "myDescirption", "myInfoComplementray", new Date(1/1/2008), new Date(1/1/2008), new Date(1/1/2008), new Date(1/1/2008), new Date(1/1/2008)); Conference conf=conferenceManager.getConference(1); ArrayList criterionList = new ArrayList(); - Criterion c1=new Criterion(); - c1.setName("respect du theme"); - c1.setConference(conf); - c1.setMax(new Integer(5)); - c1.setMin(new Integer(1)); + Criterion c1=new Criterion("respect du theme",new Integer(1),new Integer(5),conf ); + + + Criterion c2=new Criterion("coherence",new Integer(1),new Integer(3),conf ); - Criterion c2=new Criterion(); - c2.setName("exactitude"); - c2.setConference(conf); - c2.setMax(new Integer(4)); - c2.setMin(new Integer(1)); criterionList.add(c1); criterionList.add(c2); - FormEvaluation evaluationForm=new FormEvaluation(); + FormEvaluation fe=new FormEvaluation(); List liste=new ArrayList(); for (Criterion c : criterionList) @@ -69,11 +63,11 @@ public class EvaluationController extends SimpleFormController { liste.add(sc); } - - evaluationForm.setSimpleRatings(liste); - evaluationForm.setCommentAuthor("no comment by author"); - evaluationForm.setCommentPCMember("no comment by pc member"); - return evaluationForm; + if (liste!=null){System.out.println("liste n'est pas null");} + fe.setSimpleRatings(liste); + fe.setCommentAuthor("no comment by author"); + fe.setCommentPCMember("no comment by pc member"); + return fe; } @Override