Refactor CMS UX API

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

diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java
index 3227c2e449cea1e0cd76f2adbbe0656313dd8054..c31159b41e91a06ebd6bfc93cba608c2c5598708 100644 (file)
--- a/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java
@@ -9,8 +9,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.cms.CmsTheme;
-import org.argeo.api.cms.CmsView;
+import org.argeo.api.cms.ux.CmsView;
 import org.argeo.app.ui.SuiteEvent;
 import org.argeo.app.ui.SuiteIcon;
 import org.argeo.app.ui.dialogs.NewUserWizard;
@@ -18,6 +17,7 @@ import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.auth.CmsRole;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.jcr.acr.JcrContent;
+import org.argeo.cms.swt.CmsSwtTheme;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.swt.Selected;
 import org.argeo.cms.swt.acr.SwtUiProvider;
@@ -25,14 +25,15 @@ import org.argeo.cms.swt.dialogs.CmsWizardDialog;
 import org.argeo.cms.swt.widgets.SwtHierarchicalPart;
 import org.argeo.cms.swt.widgets.SwtTabularPart;
 import org.argeo.cms.ui.CmsUiProvider;
+import org.argeo.cms.ux.widgets.Column;
 import org.argeo.cms.ux.widgets.HierarchicalPart;
 import org.argeo.cms.ux.widgets.TabularPart;
-import org.argeo.osgi.useradmin.FunctionalGroup;
-import org.argeo.osgi.useradmin.HierarchyUnit;
-import org.argeo.osgi.useradmin.Organization;
-import org.argeo.osgi.useradmin.Person;
 import org.argeo.osgi.useradmin.UserDirectory;
 import org.argeo.util.LangUtils;
+import org.argeo.util.directory.FunctionalGroup;
+import org.argeo.util.directory.HierarchyUnit;
+import org.argeo.util.directory.Organization;
+import org.argeo.util.directory.Person;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.swt.SWT;
@@ -58,7 +59,7 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
 
        @Override
        public Control createUiPart(Composite parent, Content context) {
-               CmsTheme theme = CmsSwtUtils.getCmsTheme(parent);
+               CmsSwtTheme theme = CmsSwtUtils.getCmsTheme(parent);
                CmsView cmsView = CmsSwtUtils.getCmsView(parent);
                parent.setLayout(new GridLayout());
 
@@ -127,11 +128,11 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                                item.setText(role.getName());
                                Image icon;
                                if (role instanceof Organization) {
-                                       icon = SuiteIcon.organisation.getSmallIcon(theme);
+                                       icon = theme.getSmallIcon(SuiteIcon.organisation);
                                } else if (role instanceof FunctionalGroup) {
-                                       icon = SuiteIcon.group.getSmallIcon(theme);
+                                       icon = theme.getSmallIcon(SuiteIcon.group);
                                } else if (role instanceof Person) {
-                                       icon = SuiteIcon.person.getSmallIcon(theme);
+                                       icon = theme.getSmallIcon(SuiteIcon.person);
                                } else {
                                        icon = null;
                                }
@@ -144,9 +145,10 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                                HierarchyUnit hu = (HierarchyUnit) getInput();
                                if (hu == null)
                                        return 0;
+                               UserDirectory ud = (UserDirectory) hu.getDirectory();
                                for (HierarchyUnit directChild : hu.getDirectHierachyUnits(false)) {
                                        if (!directChild.isFunctional()) {
-                                               for (Role r : directChild.getHierarchyUnitRoles(null, false)) {
+                                               for (Role r : ud.getHierarchyUnitRoles(directChild, null, false)) {
                                                        if (r instanceof Person || r instanceof Organization)
                                                                roles.add(r);
                                                }
@@ -157,6 +159,13 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                        }
 
                };
+               usersView.addColumn(new Column<User>() {
+
+                       @Override
+                       public String getText(User model) {
+                               return model.toString();
+                       }
+               });
 
                Composite bottom = new Composite(parent, SWT.NONE);
                bottom.setLayoutData(CmsSwtUtils.fillWidth());
@@ -166,10 +175,11 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                ToolItem deleteItem = new ToolItem(bottomToolBar, SWT.FLAT);
                deleteItem.setEnabled(false);
 //             CmsUiUtils.style(deleteItem, SuiteStyle.recentItems);
-               deleteItem.setImage(SuiteIcon.delete.getSmallIcon(theme));
+               deleteItem.setImage(theme.getSmallIcon(SuiteIcon.delete));
                ToolItem addItem = new ToolItem(bottomToolBar, SWT.FLAT);
-               addItem.setImage(SuiteIcon.add.getSmallIcon(theme));
+               addItem.setImage(theme.getSmallIcon(SuiteIcon.add));
 
+               sashForm.setWeights(new int[] { 30, 70 });
                // CONTROLLER
                directoriesView.onSelected((o) -> {
                        if (o instanceof HierarchyUnit) {