Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

change role to enum

Browse Source
This commit is contained in:
Athou
2013-03-30 19:06:32 +01:00
parent 06aa9c4a6f
commit d8b8f6617a
15 changed files with 77 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/commafeed/frontend/CommaFeedSession.java
View File

@@ -1,5 +1,7 @@
package com.commafeed.frontend;
import java.util.Set;
import javax.inject.Inject;
import org.apache.wicket.Session;
@@ -10,6 +12,8 @@ import org.apache.wicket.request.Request;
import com.commafeed.backend.dao.UserRoleService;
import com.commafeed.backend.dao.UserService;
import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserRole.Role;
import com.google.common.collect.Sets;
@SuppressWarnings("serial")
public class CommaFeedSession extends AuthenticatedWebSession {
@@ -51,9 +55,13 @@ public class CommaFeedSession extends AuthenticatedWebSession {
this.user = null;
this.roles = new Roles();
} else {
Set<String> roleSet = Sets.newHashSet();
for (Role role : userRoleService.getRoles(user)) {
roleSet.add(role.name());
}
this.user = user;
this.roles = new Roles(userRoleService.getRoles(user).toArray(
new String[0]));
this.roles = new Roles(roleSet.toArray(new String[0]));
}
return user != null;
}