This commit is contained in:
@@ -13,7 +13,7 @@ public class RolePK implements Serializable{
|
|||||||
|
|
||||||
private User user;
|
private User user;
|
||||||
private Conference conference;
|
private Conference conference;
|
||||||
public User getUserId() {
|
public User getUser() {
|
||||||
return user;
|
return user;
|
||||||
}
|
}
|
||||||
public void setUser(User user) {
|
public void setUser(User user) {
|
||||||
@@ -22,7 +22,7 @@ public class RolePK implements Serializable{
|
|||||||
public Conference getConference() {
|
public Conference getConference() {
|
||||||
return conference;
|
return conference;
|
||||||
}
|
}
|
||||||
public void setConferenceId(Conference conferenceId) {
|
public void setConference(Conference conference) {
|
||||||
this.conference = conference;
|
this.conference = conference;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,10 @@ import org.yacos.core.conferences.Conference;
|
|||||||
*/
|
*/
|
||||||
@Entity
|
@Entity
|
||||||
public class User implements Serializable{
|
public class User implements Serializable{
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
/**
|
/**
|
||||||
* Unique login of the user
|
* Unique login of the user
|
||||||
* Is used to identify the user, should be unique and can't be modified
|
* 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);
|
roles.add(role);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addRoleForConference(Role.RoleType roleType, Conference conference){
|
/*public void addRoleForConference(Role.RoleType roleType, Conference conference){
|
||||||
if(! hasRoleForConference(roleType,conference)){
|
if(! hasRoleForConference(roleType,conference)){
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// TODO : declare and throw an exception
|
// TODO : declare and throw an exception
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
||||||
public boolean hasRoleForConference(Role.RoleType roleType, Conference conference){
|
public boolean hasRoleForConference(Role.RoleType roleType, Conference conference){
|
||||||
// TODO
|
// TODO
|
||||||
|
|||||||
Reference in New Issue
Block a user