Clarify Suite UX

[gpl/argeo-suite.git] / swt / org.argeo.app.ui / src / org / argeo / app / ui / people / PeopleEntryArea.java

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 789698bcf21f4904a5217244478be393cf432a86..339ea25dcc6f8807009f3601da3fa32928a15caf 100644 (file)
--- 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
@@ -11,7 +11,7 @@ import org.argeo.api.acr.ContentRepository;
 import org.argeo.api.acr.ContentSession;
 import org.argeo.api.cms.ux.CmsIcon;
 import org.argeo.api.cms.ux.CmsView;
-import org.argeo.app.ui.SuiteEvent;
+import org.argeo.app.ui.SuiteUxEvent;
 import org.argeo.app.ui.SuiteIcon;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.acr.ContentUtils;
@@ -129,7 +129,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider {
                        }
 
                };
-               SwtTreeView<HierarchyUnit> directoriesView = new SwtTreeView<>(sashForm, SWT.NONE, hierarchyPart);
+               SwtTreeView<HierarchyUnit> directoriesView = new SwtTreeView<>(sashForm, SWT.BORDER, hierarchyPart);
 
                DefaultTabularPart<HierarchyUnit, Content> usersPart = new DefaultTabularPart<>() {
 
@@ -152,7 +152,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider {
                                                                Content content = ContentUtils.roleToContent(cmsUserManager, contentSession, r);
                                                                // if (r instanceof Person || r instanceof Organization)
                                                                if (content.hasContentClass(LdapObjs.inetOrgPerson.qName(),
-                                                                               LdapObjs.organization.qName()))
+                                                                               LdapObjs.organization.qName(), LdapObjs.groupOfNames.qName()))
                                                                        roles.add(content);
                                                        }
                                                }
@@ -197,7 +197,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider {
                });
                usersPart.addColumn((Column<Content>) (role) -> role.attr(LdapAttrs.mail.qName()));
 
-               SwtTableView<HierarchyUnit, Content> usersView = new SwtTableView<>(sashForm, SWT.NONE, usersPart);
+               SwtTableView<HierarchyUnit, Content> usersView = new SwtTableView<>(sashForm, SWT.BORDER, usersPart);
 
                // toolbar
                Composite bottom = new Composite(parent, SWT.NONE);
@@ -219,15 +219,15 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider {
                        if (o instanceof HierarchyUnit) {
                                HierarchyUnit hierarchyUnit = (HierarchyUnit) o;
                                usersPart.setInput(hierarchyUnit);
-                               cmsView.sendEvent(SuiteEvent.refreshPart.topic(),
-                                               SuiteEvent.eventProperties(ContentUtils.hierarchyUnitToContent(contentSession, hierarchyUnit)));
+                               cmsView.sendEvent(SuiteUxEvent.refreshPart.topic(),
+                                               SuiteUxEvent.eventProperties(ContentUtils.hierarchyUnitToContent(contentSession, hierarchyUnit)));
                        }
                });
 
                usersPart.onSelected((o) -> {
                        Content user = (Content) o;
                        if (user != null) {
-                               cmsView.sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(user));
+                               cmsView.sendEvent(SuiteUxEvent.refreshPart.topic(), SuiteUxEvent.eventProperties(user));
                                deleteItem.setEnabled(true);
                        } else {
                                deleteItem.setEnabled(false);
@@ -237,7 +237,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider {
                usersPart.onAction((o) -> {
                        Content user = (Content) o;
                        if (user != null) {
-                               cmsView.sendEvent(SuiteEvent.openNewPart.topic(), SuiteEvent.eventProperties(user));
+                               cmsView.sendEvent(SuiteUxEvent.openNewPart.topic(), SuiteUxEvent.eventProperties(user));
                        }
                });