From 4152d4ed464ebfbdcbfeaf65c70ff20a317fa77e Mon Sep 17 00:00:00 2001 From: Frederic Debuire Date: Mon, 17 Dec 2007 15:04:07 +0000 Subject: [PATCH] Plein de modif Policy failures: Code warning - failed on resource DispatchArticleController.java. Reason: ArrayList is a raw type. References to generic type ArrayList should be parameterized, line 37 - failed on resource DispatchArticleController.java. Reason: ArrayList is a raw type. References to generic type ArrayList should be parameterized, line 38 - failed on resource DispatchArticleController.java. Reason: ArrayList is a raw type. References to generic type ArrayList should be parameterized, line 62 - failed on resource DispatchArticleController.java. Reason: ArrayList is a raw type. References to generic type ArrayList should be parameterized, line 63 - failed on resource ChoosePreferenceControllerOK.java. Reason: The import java.util.Date is never used, line 14 ... and more. Override reason: haha --- .../WEB-INF/jsp/choosePreference.jsp | 18 ++++++------ .../WEB-INF/jsp/submissionArticle.jsp | 4 +-- YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml | 8 ++++-- .../ChoosePreferenceController.java | 7 +---- .../ChoosePreferenceControllerOK.java | 28 +++++++++++++++++++ .../controller/DispatchArticleController.java | 2 +- .../web/PCmember/form/FormPreference.java | 20 ++++++------- 7 files changed, 56 insertions(+), 31 deletions(-) create mode 100644 YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceControllerOK.java diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp index 7123fa9..568fa9f 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp @@ -6,25 +6,25 @@

- + - +
- + - + - + - - - "> + + -
">${article.title}"">${article.title}
+ + "/> diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp index 72f5aa4..c3df5d7 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp @@ -45,8 +45,8 @@ function Supprimer(form) {

- > - >

+ "/> + "/>

diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml index eeeeb23..63a8982 100644 --- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml +++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml @@ -19,6 +19,8 @@ + + @@ -30,18 +32,18 @@ - + - + - + diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java index c86a765..4405630 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java @@ -33,8 +33,6 @@ public class ChoosePreferenceController extends SimpleFormController { List
articleList=new ArrayList
(); - System.out.println("hihi"); - Article a=new Article(1,"j2ee in action","j2ee discussion","","",null,1); Article b=new Article(2,"php in action","php discussion","","",null,1); articleList.add(a); @@ -55,13 +53,10 @@ public class ChoosePreferenceController extends SimpleFormController { List listPreference=fp.getPreferences(); // to do with the part of core using preferenceManager - return new ModelAndView("choosePreferenceOK"); + return new ModelAndView(new RedirectView(getSuccessView())); } - - - public IArticleManager getArticleManager() { return articleManager; } diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceControllerOK.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceControllerOK.java new file mode 100644 index 0000000..f86ad37 --- /dev/null +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceControllerOK.java @@ -0,0 +1,28 @@ +package org.yacos.web.PCmember.controller; + +import org.springframework.web.servlet.mvc.SimpleFormController; +import org.springframework.web.servlet.ModelAndView; + +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 java.io.IOException; +import java.util.Date; + +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/controller/DispatchArticleController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/DispatchArticleController.java index aa18d61..7834cad 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/DispatchArticleController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/DispatchArticleController.java @@ -73,7 +73,7 @@ public class DispatchArticleController extends SimpleFormController{ request.getSession().setAttribute("members",members); /*fin de test*/ - return new ModelAndView("dispachArticle", "articles",articles); + return new ModelAndView("dispatchArticle", "articles", articles); } /*public ModelAndView handleRequest(HttpServletRequest arg0, diff --git a/YACOSWeb/src/org/yacos/web/PCmember/form/FormPreference.java b/YACOSWeb/src/org/yacos/web/PCmember/form/FormPreference.java index 89ae9db..4120c74 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/form/FormPreference.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/form/FormPreference.java @@ -7,16 +7,16 @@ import org.yacos.core.article.Preference; public class FormPreference { - private List preferences = new AutoInitArrayList (Preference.class ); + private List preferences = new AutoInitArrayList (Preference.class ); - public List getPreferences() - { - return preferences; - } + public List getPreferences() + { + return preferences; + } - public void setPreferences(List preferences) - - { - this.preferences = preferences; - } + public void setPreferences(List preferences) + + { + this.preferences = preferences; + } } \ No newline at end of file