X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.e4%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Fusers%2FUserEditor.java;h=3d67b8c3b599786e50fa02233114bf5c9e9e86d1;hb=e7dc62c485696931a3e048d9102a7c86f9323b92;hp=4ac96464bba2298f9641f66ff170130912198538;hpb=088c1b517a543e935d8ab65c3b2fd2d0269b551d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java
index 4ac96464b..3d67b8c3b 100644
--- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java
+++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java
@@ -15,7 +15,7 @@
  */
 package org.argeo.cms.e4.users;
 
-import static org.argeo.cms.util.UserAdminUtils.getProperty;
+import static org.argeo.cms.auth.UserAdminUtils.getProperty;
 import static org.argeo.naming.LdapAttrs.cn;
 import static org.argeo.naming.LdapAttrs.givenName;
 import static org.argeo.naming.LdapAttrs.mail;
@@ -28,8 +28,9 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import org.argeo.cms.ArgeoNames;
+import org.argeo.api.NodeConstants;
 import org.argeo.cms.auth.CurrentUser;
+import org.argeo.cms.auth.UserAdminUtils;
 import org.argeo.cms.e4.users.providers.CommonNameLP;
 import org.argeo.cms.e4.users.providers.DomainNameLP;
 import org.argeo.cms.e4.users.providers.RoleIconLP;
@@ -37,13 +38,11 @@ import org.argeo.cms.e4.users.providers.UserFilter;
 import org.argeo.cms.ui.eclipse.forms.AbstractFormPart;
 //import org.argeo.cms.ui.eclipse.forms.FormToolkit;
 import org.argeo.cms.ui.eclipse.forms.IManagedForm;
-import org.argeo.cms.util.CmsUtils;
-import org.argeo.cms.util.UserAdminUtils;
+import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.parts.LdifUsersTable;
 import org.argeo.naming.LdapAttrs;
-import org.argeo.node.NodeConstants;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ToolBarManager;
@@ -82,7 +81,7 @@ import org.osgi.service.useradmin.UserAdmin;
 import org.osgi.service.useradmin.UserAdminEvent;
 
 /** Display/edit the properties of a given user */
-public class UserEditor extends AbstractRoleEditor implements ArgeoNames {
+public class UserEditor extends AbstractRoleEditor {
 	// final static String ID = "UserEditor.mainPage";
 
 	@Inject
@@ -120,7 +119,7 @@ public class UserEditor extends AbstractRoleEditor implements ArgeoNames {
 		// mainLayout.marginRight = 10;
 		body.setLayout(mainLayout);
 		// body.getParent().setLayout(new GridLayout());
-		// body.setLayoutData(CmsUtils.fillAll());
+		// body.setLayoutData(CmsUiUtils.fillAll());
 		User user = getDisplayedUser();
 		appendOverviewPart(body, user);
 		// Remove to ability to force the password for his own user. The user
@@ -294,7 +293,7 @@ public class UserEditor extends AbstractRoleEditor implements ArgeoNames {
 		// Composite body= parent;
 		Composite body = new Composite(parent, SWT.BORDER);
 		body.setLayout(new GridLayout());
-		body.setLayoutData(CmsUtils.fillAll());
+		body.setLayoutData(CmsUiUtils.fillAll());
 
 		// boolean isAdmin = CurrentUser.isInRole(NodeConstants.ROLE_ADMIN);
 
@@ -362,7 +361,7 @@ public class UserEditor extends AbstractRoleEditor implements ArgeoNames {
 		Action action = new RemoveMembershipAction(userViewer, user, tooltip, SecurityAdminImages.ICON_REMOVE_DESC);
 		ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
 		ToolBar toolBar = toolBarManager.createControl(body);
-		toolBar.setLayoutData(CmsUtils.fillWidth());
+		toolBar.setLayoutData(CmsUiUtils.fillWidth());
 		toolBarManager.add(action);
 		toolBarManager.update(true);
 		return userViewerCmp;