Introduce Makefile for Java build

[lgpl/argeo-commons.git] / org.argeo.cms.e4 / src / org / argeo / cms / e4 / users / UserEditor.java

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 18753f7ba9eb0b1e362475a0ddd87a68ef5fd65c..66f442082191a10f1161ea9cce546810d87700e5 100644 (file)
--- 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,11 +1,11 @@
 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;
@@ -13,21 +13,21 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import org.argeo.api.NodeConstants;
+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.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.util.naming.LdapAttrs;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ToolBarManager;
@@ -278,7 +278,7 @@ public class UserEditor extends AbstractRoleEditor {
                // Composite body= parent;
                Composite body = new Composite(parent, SWT.BORDER);
                body.setLayout(new GridLayout());
-               body.setLayoutData(CmsUiUtils.fillAll());
+               body.setLayoutData(CmsSwtUtils.fillAll());
 
                // boolean isAdmin = CurrentUser.isInRole(NodeConstants.ROLE_ADMIN);
 
@@ -346,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(CmsUiUtils.fillWidth());
+               toolBar.setLayoutData(CmsSwtUtils.fillWidth());
                toolBarManager.add(action);
                toolBarManager.update(true);
                return userViewerCmp;
@@ -370,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() {