From 7ce0d0d278ae17558d17a7c2138c3e51ab089eb7 Mon Sep 17 00:00:00 2001
From: Maxime Dagnicourt <maxime.dagnicourt@gmail.com>
Date: Thu, 10 Jan 2008 00:30:35 +0000
Subject: [PATCH]

---
 YACOSCore/ejbModule/org/yacos/core/users/RolePK.java | 4 ++--
 YACOSCore/ejbModule/org/yacos/core/users/User.java   | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/YACOSCore/ejbModule/org/yacos/core/users/RolePK.java b/YACOSCore/ejbModule/org/yacos/core/users/RolePK.java
index 2e66fd5..7e0e489 100644
--- a/YACOSCore/ejbModule/org/yacos/core/users/RolePK.java
+++ b/YACOSCore/ejbModule/org/yacos/core/users/RolePK.java
@@ -13,7 +13,7 @@ public class RolePK implements Serializable{
 	
 	private User user;
 	private Conference conference;
-	public User getUserId() {
+	public User getUser() {
 		return user;
 	}
 	public void setUser(User user) {
@@ -22,7 +22,7 @@ public class RolePK implements Serializable{
 	public Conference getConference() {
 		return conference;
 	}
-	public void setConferenceId(Conference conferenceId) {
+	public void setConference(Conference conference) {
 		this.conference = conference;
 	}
 	
diff --git a/YACOSCore/ejbModule/org/yacos/core/users/User.java b/YACOSCore/ejbModule/org/yacos/core/users/User.java
index 08986b3..f95c56a 100644
--- a/YACOSCore/ejbModule/org/yacos/core/users/User.java
+++ b/YACOSCore/ejbModule/org/yacos/core/users/User.java
@@ -20,6 +20,10 @@ import org.yacos.core.conferences.Conference;
  */
 @Entity
 public class User implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	/**
 	 * Unique login of the user
 	 * Is used to identify the user, should be unique and can't be modified
@@ -112,13 +116,13 @@ public class User implements Serializable{
 		roles.add(role);
 	}
 	
-	public void addRoleForConference(Role.RoleType roleType, Conference conference){
+	/*public void addRoleForConference(Role.RoleType roleType, Conference conference){
 		if(! hasRoleForConference(roleType,conference)){
 			
 		} else {
 			// TODO : declare and throw an exception
 		}
-	}
+	}*/
 	
 	public boolean hasRoleForConference(Role.RoleType roleType, Conference conference){
 		// TODO