X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fusers%2FUserRolesPart.java;h=610c49c7f7f9e2994b1dc97be64135a2728c6ebc;hb=3dd2fac453c0268721370c009d4b1515a9b02cd8;hp=e813a43d59f85ad8c78ce428dabddda97133d06b;hpb=236d4f8f0f62dcb6ac4598698c3d9f4ae5dd5118;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 e813a43d5..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;
@@ -27,12 +28,13 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
 import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 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,
@@ -77,14 +79,15 @@ public class UserRolesPart extends StyledControl implements EditablePart,
 	}
 
 	@Override
-	protected Control createControl(Composite box, String style) {
-		box.setLayout(CmsUtils.noSpaceGridLayout());
+	public Control createControl(Composite box, String style) {
+		// box.setLayout(CmsUtils.noSpaceGridLayout());
+		box.setLayout(new GridLayout());
 
 		Label header = new Label(box, SWT.NONE);
 		header.setText(" Groups");
 		CmsUtils.style(header, UserStyles.USER_FORM_TITLE);
 		header.setLayoutData(CmsUtils.fillWidth());
-		
+
 		int swtStyle = SWT.CHECK | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL;
 		if (!isEditing())
 			swtStyle |= SWT.READ_ONLY;
@@ -171,28 +174,24 @@ 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
 						.loadUserByUsername(username);
 				setUserDetails(userDetails);
 			}
 		} catch (Exception e) {
-			throw new ArgeoException("Cannot retrieve userDetails for "// +
-																		// username
-					, e);
+			throw new ArgeoException("Cannot retrieve userDetails for "
+					+ getNode(), e);
 		}
 
 	}
 
 	public void setUserDetails(JcrUserDetails userDetails) {
 		this.userDetails = userDetails;
-
 		this.roles = new ArrayList<String>();
 		for (GrantedAuthority ga : userDetails.getAuthorities())
 			roles.add(ga.getAuthority());