X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fusers%2FUserRolesPart.java;h=610c49c7f7f9e2994b1dc97be64135a2728c6ebc;hb=a54e2b883c05a913a187133f9d141124e26fb1c2;hp=204158a75ac22ed645d756e63ed29c74d36a57e8;hpb=b24a4a0c22f8fb24800d9484160764544796cc17;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java b/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java
index 204158a75..610c49c7f 100644
--- a/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java
+++ b/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java
@@ -4,16 +4,17 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.jcr.Item;
+import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.argeo.ArgeoException;
-import org.argeo.cms.CmsUtils;
+import org.argeo.cms.internal.auth.JcrSecurityModel;
+import org.argeo.cms.util.CmsUtils;
 import org.argeo.cms.viewers.EditablePart;
 import org.argeo.cms.viewers.NodePart;
 import org.argeo.cms.widgets.StyledControl;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.security.UserAdminService;
-import org.argeo.security.jcr.JcrSecurityModel;
 import org.argeo.security.jcr.JcrUserDetails;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
@@ -33,7 +34,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
-import org.springframework.security.GrantedAuthority;
+import org.springframework.security.core.GrantedAuthority;
 
 /** Display a single user main info once it has been created. */
 public class UserRolesPart extends StyledControl implements EditablePart,
@@ -78,7 +79,7 @@ public class UserRolesPart extends StyledControl implements EditablePart,
 	}
 
 	@Override
-	protected Control createControl(Composite box, String style) {
+	public Control createControl(Composite box, String style) {
 		// box.setLayout(CmsUtils.noSpaceGridLayout());
 		box.setLayout(new GridLayout());
 
@@ -174,7 +175,8 @@ public class UserRolesPart extends StyledControl implements EditablePart,
 	public void setUserAdminService(UserAdminService userAdminService) {
 		this.userAdminService = userAdminService;
 		try {
-			String username = getNode().getProperty(ArgeoNames.ARGEO_USER_ID)
+			Node currNode = getNode();
+			String username = currNode.getProperty(ArgeoNames.ARGEO_USER_ID)
 					.getString();
 			if (userAdminService.userExists(username)) {
 				JcrUserDetails userDetails = (JcrUserDetails) userAdminService