X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FPeopleEntryArea.java;h=e2339919bec00a17f3c7eee8e3b0e6612ddc8777;hb=bb0d8f19da5caff8bad3986e17cdff4cb5dcd236;hp=41310aa8c6e8f36a0c46f918526169653e81334e;hpb=0b492f2cfb8a24ec84e1dd52825624f5e9ab7e81;p=gpl%2Fargeo-suite.git

diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java
index 41310aa..e233991 100644
--- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java
+++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java
@@ -6,7 +6,7 @@ import javax.jcr.RepositoryException;
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentRepository;
 import org.argeo.api.acr.ContentSession;
-import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttr;
 import org.argeo.api.cms.directory.CmsUserManager;
 import org.argeo.api.cms.directory.HierarchyUnit;
 import org.argeo.api.cms.ux.CmsView;
@@ -23,9 +23,9 @@ import org.argeo.cms.swt.widgets.SwtGuidedFormDialog;
 import org.argeo.cms.swt.widgets.SwtTableView;
 import org.argeo.cms.swt.widgets.SwtTreeView;
 import org.argeo.cms.ui.CmsUiProvider;
+import org.argeo.cms.ux.widgets.CmsDialog;
 import org.argeo.cms.ux.widgets.Column;
 import org.argeo.cms.ux.widgets.GuidedForm;
-import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.graphics.Point;
@@ -66,7 +66,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider {
 
 			@Override
 			public String getText(Content role) {
-				return role.attr(LdapAttrs.mail);
+				return role.attr(LdapAttr.mail);
 			}
 
 			@Override
@@ -83,7 +83,6 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider {
 
 		ToolItem deleteItem = new ToolItem(bottomToolBar, SWT.FLAT);
 		deleteItem.setEnabled(false);
-//		CmsUiUtils.style(deleteItem, SuiteStyle.recentItems);
 		deleteItem.setImage(theme.getSmallIcon(SuiteIcon.delete));
 
 		Menu menu = new Menu(Display.getCurrent().getActiveShell(), SWT.POP_UP);
@@ -97,7 +96,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider {
 			Content huContent = ContentUtils.hierarchyUnitToContent(contentSession, hierarchyUnit);
 			GuidedForm wizard = new NewUserForm(cmsUserManager, huContent);
 			SwtGuidedFormDialog dialog = new SwtGuidedFormDialog(parent.getShell(), wizard);
-			if (dialog.open() == Window.OK) {
+			if (dialog.open() == CmsDialog.OK) {
 				// TODO create
 			}
 		});
@@ -110,7 +109,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider {
 			Content huContent = ContentUtils.hierarchyUnitToContent(contentSession, hierarchyUnit);
 			GuidedForm wizard = new NewOrgForm(cmsUserManager, huContent);
 			SwtGuidedFormDialog dialog = new SwtGuidedFormDialog(parent.getShell(), wizard);
-			if (dialog.open() == Window.OK) {
+			if (dialog.open() == CmsDialog.OK) {
 				// TODO create
 			}
 		});