Commit 373f73af by Juho Juopperi

removed funky scala import from UserBean. Also made a function non static.

1 parent f4550fa2
...@@ -96,7 +96,6 @@ import fi.codecrew.moya.utilities.PasswordFunctions; ...@@ -96,7 +96,6 @@ import fi.codecrew.moya.utilities.PasswordFunctions;
import fi.codecrew.moya.utilities.SearchQuery; import fi.codecrew.moya.utilities.SearchQuery;
import fi.codecrew.moya.utilities.SearchResult; import fi.codecrew.moya.utilities.SearchResult;
import fi.codecrew.moya.utilities.moyamessage.MoyaEventType; import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
import scala.tools.cmd.Spec;
@LocalBean @LocalBean
@Stateless @Stateless
...@@ -268,13 +267,13 @@ public class UserBean implements UserBeanLocal { ...@@ -268,13 +267,13 @@ public class UserBean implements UserBeanLocal {
return checkedRoles; return checkedRoles;
} }
private static void addRecursive(Set<Role> checkedRoles, Collection<Role> roles) { private void addRecursive(Set<Role> checkedRoles, Collection<Role> roles) {
for (Role r : roles) { for (Role r : roles) {
addRecursive(checkedRoles, r); addRecursive(checkedRoles, r);
} }
} }
private static void addRecursive(Set<Role> checkedRoles, Role role) { private void addRecursive(Set<Role> checkedRoles, Role role) {
if (role == null || checkedRoles.contains(role)) { if (role == null || checkedRoles.contains(role)) {
return; return;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!