Clean userAdmin related classes

[lgpl/argeo-commons.git] / org.argeo.cms.ui.workbench / src / org / argeo / cms / ui / workbench / internal / useradmin / parts / GroupsView.java

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java
index ec20a04e7d8e60829047a9ee99382ead81a25947..8cb284134b8189b6e5879bb15e65c15c9c735414 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java
@@ -34,9 +34,10 @@ import org.argeo.cms.util.useradmin.UserAdminUtils;
 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.naming.LdapObjs;
 import org.argeo.node.ArgeoNames;
 import org.argeo.node.NodeConstants;
-import org.argeo.osgi.useradmin.LdifName;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
@@ -145,8 +146,8 @@ public class GroupsView extends ViewPart implements ArgeoNames {
 
                private boolean showSystemRoles = false;
 
-               private final String[] knownProps = { LdifName.uid.name(),
-                               LdifName.cn.name(), LdifName.dn.name() };
+               private final String[] knownProps = { LdapAttrs.uid.name(),
+                               LdapAttrs.cn.name(), LdapAttrs.DN };
 
                public MyUserTableViewer(Composite parent, int style) {
                        super(parent, style);
@@ -184,12 +185,11 @@ public class GroupsView extends ViewPart implements ArgeoNames {
                                                tmpBuilder.append("*)");
                                        }
                                if (tmpBuilder.length() > 1) {
-                                       builder.append("(&(").append(LdifName.objectClass.name())
-                                                       .append("=").append(LdifName.groupOfNames.name())
+                                       builder.append("(&(").append(LdapAttrs.objectClass.name())
+                                                       .append("=").append(LdapObjs.groupOfNames.name())
                                                        .append(")");
                                        if (!showSystemRoles)
-                                               builder.append("(!(").append(LdifName.dn.name())
-                                                               .append("=*")
+                                               builder.append("(!(").append(LdapAttrs.DN).append("=*")
                                                                .append(NodeConstants.ROLES_BASEDN)
                                                                .append("))");
                                        builder.append("(|");
@@ -198,17 +198,18 @@ public class GroupsView extends ViewPart implements ArgeoNames {
                                } else {
                                        if (!showSystemRoles)
                                                builder.append("(&(")
-                                                               .append(LdifName.objectClass.name())
+                                                               .append(LdapAttrs.objectClass.name())
                                                                .append("=")
-                                                               .append(LdifName.groupOfNames.name())
-                                                               .append(")(!(").append(LdifName.dn.name())
+                                                               .append(LdapObjs.groupOfNames.name())
+                                                               .append(")(!(").append(LdapAttrs.DN)
                                                                .append("=*")
                                                                .append(NodeConstants.ROLES_BASEDN)
                                                                .append(")))");
                                        else
-                                               builder.append("(").append(LdifName.objectClass.name())
+                                               builder.append("(")
+                                                               .append(LdapAttrs.objectClass.name())
                                                                .append("=")
-                                                               .append(LdifName.groupOfNames.name())
+                                                               .append(LdapObjs.groupOfNames.name())
                                                                .append(")");
 
                                }
@@ -249,4 +250,4 @@ public class GroupsView extends ViewPart implements ArgeoNames {
        public void setUserAdminWrapper(UserAdminWrapper userAdminWrapper) {
                this.userAdminWrapper = userAdminWrapper;
        }
-}
\ No newline at end of file
+}