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

major classes refactoring

Browse Source
This commit is contained in:
Athou
2013-04-11 20:49:08 +02:00
parent 54ebf7b9db
commit 5b5ad242e0
31 changed files with 380 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,10 +9,10 @@ import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.authroles.authorization.strategies.role.Roles;
import org.apache.wicket.request.Request;
import com.commafeed.backend.dao.UserRoleService;
import com.commafeed.backend.dao.UserService;
import com.commafeed.backend.dao.UserRoleDAO;
import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.backend.services.UserService;
import com.google.common.collect.Sets;
@SuppressWarnings("serial")
@@ -22,7 +22,7 @@ public class CommaFeedSession extends AuthenticatedWebSession {
UserService userService;
@Inject
UserRoleService userRoleService;
UserRoleDAO userRoleDAO;
private User user;
private Roles roles = new Roles();
@@ -57,7 +57,7 @@ public class CommaFeedSession extends AuthenticatedWebSession {
} else {
Set<String> roleSet = Sets.newHashSet();
for (Role role : userRoleService.getRoles(user)) {
for (Role role : userRoleDAO.findRoles(user)) {
roleSet.add(role.name());
}
this.user = user;