@@ -31,7 +32,6 @@ function Supprimer(form) {
-
diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
index 3fe7470..d5e1cfb 100644
--- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
+++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
@@ -30,7 +30,7 @@
-
+
@@ -40,7 +40,8 @@
-
+
+
@@ -72,6 +73,7 @@
-
+
+
\ 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 88b76f3..3a1f89e 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java
@@ -3,20 +3,17 @@ package org.yacos.web.PCmember.controller;
import java.util.*;
-
-
-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.validation.BindException;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.SimpleFormController;
-import org.springframework.web.servlet.view.RedirectView;
import org.yacos.core.article.*;
+import org.yacos.core.users.IUsersManager;
+import org.yacos.core.users.User;
//import org.yacos.web.author.form.*;
import org.yacos.web.PCmember.form.FormPreference;
@@ -26,21 +23,34 @@ public class ChoosePreferenceController extends SimpleFormController {
protected final Log logger = LogFactory.getLog(getClass());
private IArticleManager articleManager;
+ private IUsersManager usersManager;
@Override
protected Object formBackingObject(HttpServletRequest request)
throws Exception {
- List articleList=new ArrayList();
-
- 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);
- articleList.add(b);
+ List articleList=articleManager.getArticles();
getServletContext().setAttribute("articleList", articleList);
- return super.formBackingObject(request);
+ User toto = usersManager.getUser("toto");
+ ArrayList preferencesList = new ArrayList();
+ Preference pref;
+ for(Article article : articleList){
+ pref = articleManager.getArticlePreferenceForUser(article, toto.getLogin());
+ if(pref == null){
+ pref = new Preference();
+ pref.setArticle(article);
+ pref.setPcMember(toto);
+ pref.setPreference("Indifferent");
+ }
+ preferencesList.add(pref);
+ }
+
+ FormPreference preferences = new FormPreference();
+ preferences.setPreferences(preferencesList);
+
+ return preferences;
}
@Override
@@ -51,8 +61,14 @@ public class ChoosePreferenceController extends SimpleFormController {
FormPreference fp=(FormPreference) command;
List listPreference=fp.getPreferences();
- // to do with the part of core using preferenceManager
- System.out.println("wangjialin");
+
+ for(Preference preference : listPreference){
+ articleManager.addArticlePreference(
+ preference.getArticle().getId(),
+ preference.getPcMember().getLogin(),
+ preference.getPreference());
+ }
+
return new ModelAndView("choosePreferenceOK");
}
@@ -65,5 +81,11 @@ public class ChoosePreferenceController extends SimpleFormController {
this.articleManager = articleManager;
}
+ public IUsersManager getUsersManager() {
+ return usersManager;
+ }
+ public void setUsersManager(IUsersManager usersManager) {
+ this.usersManager = usersManager;
+ }
}
\ 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 4120c74..cadaa16 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/form/FormPreference.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/form/FormPreference.java
@@ -1,5 +1,6 @@
package org.yacos.web.PCmember.form;
+import java.util.ArrayList;
import java.util.List;
import org.yacos.core.article.Preference;
@@ -7,16 +8,15 @@ import org.yacos.core.article.Preference;
public class FormPreference {
- private List preferences = new AutoInitArrayList (Preference.class );
+ private List preferences = new ArrayList();
public List getPreferences()
{
return preferences;
- }
-
- public void setPreferences(List preferences)
+ }
+ public void setPreferences(List preferences)
{
this.preferences = preferences;
- }
-}
\ No newline at end of file
+ }
+}
diff --git a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java
index 9e1e978..beb9ea3 100644
--- a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java
+++ b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java
@@ -5,6 +5,7 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URL;
+import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -36,7 +37,7 @@ public class SArticleController extends SimpleFormController {
String theme = ((FormSubmission) command).getTheme();
String mainauthor = ((FormSubmission) command).getMainauthor();
String secondaryauthor = ((FormSubmission) command).getSecondaryauthor();
- String liste = ((FormSubmission) command).getListe();
+ List liste = ((FormSubmission) command).getListe();
String nomFile="";
diff --git a/YACOSWeb/src/org/yacos/web/author/form/FormSubmission.java b/YACOSWeb/src/org/yacos/web/author/form/FormSubmission.java
index e363493..515b744 100644
--- a/YACOSWeb/src/org/yacos/web/author/form/FormSubmission.java
+++ b/YACOSWeb/src/org/yacos/web/author/form/FormSubmission.java
@@ -1,5 +1,6 @@
package org.yacos.web.author.form;
+import java.util.ArrayList;
import java.util.List;
import org.springframework.web.multipart.MultipartFile;
@@ -11,7 +12,7 @@ public class FormSubmission {
private String theme;
private String mainauthor;
private String secondaryauthor;
- private String liste;
+ private ArrayList liste;
public FormSubmission() {
@@ -50,11 +51,11 @@ public class FormSubmission {
this.secondaryauthor = secondaryauthor;
}
- public String getListe() {
+ public List getListe() {
return liste;
}
- public void setListe(String liste) {
+ public void setListe(ArrayList liste) {
this.liste = liste;
}