From 8f0c932de0d6ea47bec02a90bc04663caf0fb9e8 Mon Sep 17 00:00:00 2001
From: Maxime Dagnicourt <maxime.dagnicourt@gmail.com>
Date: Mon, 14 Jan 2008 17:01:34 +0000
Subject: [PATCH]

---
 .../conferences/ConferenceManagerBean.java    | 38 +++++++++----------
 .../core/conferences/IConferenceManager.java  |  3 +-
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java b/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java
index 75b4215..7dbcbd6 100644
--- a/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java
+++ b/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java
@@ -1,5 +1,6 @@
 package org.yacos.core.conferences;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -10,7 +11,7 @@ import javax.persistence.Query;
 
 import org.yacos.core.users.Role;
 import org.yacos.core.users.User;
-import org.yacos.core.users.Role.RoleType;
+import org.yacos.core.users.UserManagerBean;
 
 
 @Stateless
@@ -24,11 +25,6 @@ public class ConferenceManagerBean implements IConferenceManager {
 		return conf;
 	}
 
-	@SuppressWarnings("unchecked")
-	public List<Conference> getConferences() {
-		 return em.createQuery("from Conference conf ORDER BY conf.id").getResultList();
-	}
-
 	public Conference getConference(Integer id) {
 		 return em.find(Conference.class, id);
 	}
@@ -42,25 +38,29 @@ public class ConferenceManagerBean implements IConferenceManager {
 		em.merge(conf);
 	}
 
-	/*
-	public List<Article> getArticles(Integer conference_id) {
-		//FIXME cast a verifier lors des tests
-		return getConference(conference_id).getArticles();
+	@SuppressWarnings("unchecked")
+	public List<Conference> getConferences() {
+		 return em.createQuery("from Conference conf ORDER BY conf.id").getResultList();
 	}
-*/
-	//FIXME
-	/*public void addArticle(User user) {
-		// TODO Auto-generated method stub
-		
-	}*/
 	
-	public List<Conference> getConferencesForUser(User user){
-		return user.getConferences();
+	public List<Conference> getConferences(User user){
+		List<Conference> list = new ArrayList<Conference>();
+		List<Role> tmpList = new UserManagerBean().getRoles();
+		System.out.println("allo????????????????????");
+		Conference conf;
+		for (Role role : tmpList) {
+			conf = role.getConference();
+			if(!list.contains(conf)){
+				list.add(conf);
+			}
+		}
+		return list;
 	}
 	
+	
 	/* 
 	 * 
-	 * méthodes relatives aux roles
+	 * méthodes relatives aux roles
 	 * */
 	
 	public void addRole(Role.RoleType roleType, User user, Conference conf) {
diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java b/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java
index e2aae94..8ff10b8 100644
--- a/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java
+++ b/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java
@@ -26,8 +26,9 @@ public interface IConferenceManager {
 	
 	//list methodes
 	public List<Conference> getConferences();
-	public List<Conference> getConferencesForUser(User user);
+	public List<Conference> getConferences(User user);
 	
+		
 	//role methode
 	public void addRole(Role.RoleType roleType, User user, Conference conf);
 	public void removeRole(Role role);