X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.e4%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Fusers%2FUserEditor.java;h=66f442082191a10f1161ea9cce546810d87700e5;hb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;hp=a35499984673b46afd9f6dec5f22c97207705ec1;hpb=b7c2f2cc2f6f74762031567e9e636ff277ebc7c7;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 a35499984..66f442082 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
@@ -1,26 +1,11 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.argeo.cms.e4.users;
 
 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;
-import static org.argeo.naming.LdapAttrs.sn;
-import static org.argeo.naming.LdapAttrs.uid;
+import static org.argeo.util.naming.LdapAttrs.cn;
+import static org.argeo.util.naming.LdapAttrs.givenName;
+import static org.argeo.util.naming.LdapAttrs.mail;
+import static org.argeo.util.naming.LdapAttrs.sn;
+import static org.argeo.util.naming.LdapAttrs.uid;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -28,21 +13,21 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import org.argeo.api.cms.CmsConstants;
 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;
 import org.argeo.cms.e4.users.providers.UserFilter;
+import org.argeo.cms.swt.CmsSwtUtils;
 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.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.argeo.util.naming.LdapAttrs;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ToolBarManager;
@@ -119,7 +104,7 @@ public class UserEditor extends AbstractRoleEditor {
 		// 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
@@ -293,7 +278,7 @@ public class UserEditor extends AbstractRoleEditor {
 		// Composite body= parent;
 		Composite body = new Composite(parent, SWT.BORDER);
 		body.setLayout(new GridLayout());
-		body.setLayoutData(CmsUtils.fillAll());
+		body.setLayoutData(CmsSwtUtils.fillAll());
 
 		// boolean isAdmin = CurrentUser.isInRole(NodeConstants.ROLE_ADMIN);
 
@@ -361,7 +346,7 @@ public class UserEditor extends AbstractRoleEditor {
 		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(CmsSwtUtils.fillWidth());
 		toolBarManager.add(action);
 		toolBarManager.update(true);
 		return userViewerCmp;
@@ -385,7 +370,7 @@ public class UserEditor extends AbstractRoleEditor {
 			staticFilterCmp.setLayout(new GridLayout());
 			showSystemRoleBtn = new Button(staticFilterCmp, SWT.CHECK);
 			showSystemRoleBtn.setText("Show system roles");
-			boolean showSysRole = CurrentUser.isInRole(NodeConstants.ROLE_ADMIN);
+			boolean showSysRole = CurrentUser.isInRole(CmsConstants.ROLE_ADMIN);
 			showSystemRoleBtn.setSelection(showSysRole);
 			userFilter.setShowSystemRole(showSysRole);
 			showSystemRoleBtn.addSelectionListener(new SelectionAdapter() {