Merge remote-tracking branch 'origin/unstable' into testing

[gpl/argeo-slc.git] / swt / org.argeo.tool.devops.e4 / src / org / argeo / cms / e4 / users / GroupEditor.java

diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupEditor.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupEditor.java
index 80c5998e3886142729a284e482241a7b8518282b..8ec16213125983f0d66da827ba296e58be0d91cb 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupEditor.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupEditor.java
@@ -1,9 +1,9 @@
 package org.argeo.cms.e4.users;
 
+import static org.argeo.api.acr.ldap.LdapAttr.businessCategory;
+import static org.argeo.api.acr.ldap.LdapAttr.description;
 import static org.argeo.api.cms.CmsContext.WORKGROUP;
 import static org.argeo.cms.auth.UserAdminUtils.setProperty;
-import static org.argeo.util.naming.LdapAttrs.businessCategory;
-import static org.argeo.util.naming.LdapAttrs.description;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -16,8 +16,10 @@ import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
+import org.argeo.api.acr.ldap.LdapAttr;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsContext;
+import org.argeo.api.cms.transaction.WorkTransaction;
 import org.argeo.cms.auth.UserAdminUtils;
 import org.argeo.cms.e4.users.providers.CommonNameLP;
 import org.argeo.cms.e4.users.providers.MailLP;
@@ -32,8 +34,6 @@ import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.util.naming.LdapAttrs;
-import org.argeo.util.transaction.WorkTransaction;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ToolBarManager;
@@ -146,7 +146,7 @@ public class GroupEditor extends AbstractRoleEditor {
                body.setLayout(layout);
                body.setLayoutData(CmsSwtUtils.fillWidth());
 
-               String cn = UserAdminUtils.getProperty(group, LdapAttrs.cn.name());
+               String cn = UserAdminUtils.getProperty(group, LdapAttr.cn.name());
                createReadOnlyLT(body, "Name", cn);
                createReadOnlyLT(body, "DN", group.getName());
                createReadOnlyLT(body, "Domain", UserAdminUtils.getDomainName(group));
@@ -194,7 +194,7 @@ public class GroupEditor extends AbstractRoleEditor {
                        public void refresh() {
                                // dnTxt.setText(group.getName());
                                // cnTxt.setText(UserAdminUtils.getProperty(group, LdapAttrs.cn.name()));
-                               descTxt.setText(UserAdminUtils.getProperty(group, LdapAttrs.description.name()));
+                               descTxt.setText(UserAdminUtils.getProperty(group, LdapAttr.description.name()));
                                Node workgroupHome = CmsJcrUtils.getGroupHome(groupsSession, cn);
                                if (workgroupHome == null)
                                        markAsWorkgroupLk.setText("<a>Mark as workgroup</a>");