diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java index b1b70ae..d28fdee 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java @@ -32,7 +32,7 @@ public class ChoosePreferenceController extends SimpleFormController { protected Object formBackingObject(HttpServletRequest request) throws Exception { Conference conf=new Conference(); - List
articleList=articleManager.getArticles(conf); + List
articleList=articleManager.getArticles(conf.getId()); getServletContext().setAttribute("articleList", articleList); diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/DispatchArticleController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/DispatchArticleController.java index e9b707a..1a713bd 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/DispatchArticleController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/DispatchArticleController.java @@ -12,6 +12,8 @@ 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.core.conferences.Conference; +import org.yacos.core.exceptions.ConferenceDoesntExistException; import org.yacos.core.users.Role; import org.yacos.core.users.User; import org.yacos.web.PCmember.form.FormDispatcher; @@ -30,22 +32,20 @@ public class DispatchArticleController extends SimpleFormController{ - protected Object formBackingObject(HttpServletRequest request) { + protected Object formBackingObject(HttpServletRequest request) throws ConferenceDoesntExistException { logger.info("Returning dispatcher view"); - /*test temporaire !!!! - Article a = new Article(1,"title1","topic","url","autor",new ArrayList(),1); - Article a2 = new Article(2,"title2","topic","url","autor",new ArrayList(),1); - Collection
articles = new ArrayList
(); - articles.add(a); - articles.add(a2);*/ + + //on recupère l'id de conference + Conference conf = (Conference)request.getSession().getAttribute("conference"); + User m = new User("max","max","maxime","dagnicourt","ipint","m@truc.fr"); User m2 = new User("bob","bob","bob","dupont","lifl","b@bb.fr"); Collection members = new ArrayList(); members.add(m); members.add(m2); request.getSession().setAttribute("members",members); - request.getSession().setAttribute("articles",articleManager.getArticles()); - logger.info(articleManager.getArticles()); + + request.getSession().setAttribute("articles",articleManager.getArticles(conf.getId())); return new FormDispatcher(); } @@ -53,6 +53,9 @@ public class DispatchArticleController extends SimpleFormController{ HttpServletResponse response, Object formDispatcher, BindException errors) throws Exception { + //on recupère l'id de conference + Conference conf = (Conference)request.getSession().getAttribute("conference"); + FormDispatcher fd = (FormDispatcher)formDispatcher; Article article = articleManager.getArticle(fd.getIdArticle()); User m = new User("bob","bob","maurice","dupont","lifl","b@bb.fr"); @@ -64,7 +67,7 @@ public class DispatchArticleController extends SimpleFormController{ request.getSession().setAttribute("members",members); - return new ModelAndView("dispatchArticle", "articles", articleManager.getArticles()); + return new ModelAndView("dispatchArticle", "articles", articleManager.getArticles(conf.getId())); } diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java index b6d06f9..5cda8ba 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java @@ -14,6 +14,7 @@ import org.springframework.web.servlet.mvc.SimpleFormController; import org.yacos.core.article.Article; import org.yacos.core.article.IArticleManager; import org.yacos.core.conferences.Conference; +import org.yacos.core.exceptions.ConferenceDoesntExistException; public class ListArticleController extends SimpleFormController { @@ -29,9 +30,14 @@ public class ListArticleController extends SimpleFormController { //FIXME verif l'existance de la conf en session Conference conf = (Conference)request.getSession().getAttribute("conference"); - List
listArticle = articleManager.getArticles(conf); - - getServletContext().setAttribute("listArticle", listArticle); + List
listArticle; + try { + listArticle = articleManager.getArticles(conf.getId()); + getServletContext().setAttribute("listArticle", listArticle); + } catch (ConferenceDoesntExistException e) { + logger.error(e.getMessage()); + } + return new ModelAndView("listArticle"); } diff --git a/YACOSWeb/src/org/yacos/web/system/controller/LogonController.java b/YACOSWeb/src/org/yacos/web/system/controller/LogonController.java new file mode 100644 index 0000000..05191c5 --- /dev/null +++ b/YACOSWeb/src/org/yacos/web/system/controller/LogonController.java @@ -0,0 +1,5 @@ +package org.yacos.web.system.controller; + +public class LogonController { + +}