Rename LDAP enums

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / acr / directory / AbstractDirectoryContent.java

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/directory/AbstractDirectoryContent.java b/org.argeo.cms/src/org/argeo/cms/acr/directory/AbstractDirectoryContent.java
index ac0a7317fba008f187be64fdc14d011a7ccd0b2f..f288420481a4c33329f5da830d7ee5522c4afd08 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/acr/directory/AbstractDirectoryContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/directory/AbstractDirectoryContent.java
@@ -14,8 +14,8 @@ import org.argeo.api.acr.ArgeoNamespace;
 import org.argeo.api.acr.ContentName;
 import org.argeo.api.acr.CrAttributeType;
 import org.argeo.api.acr.NamespaceUtils;
-import org.argeo.api.acr.ldap.LdapAttrs;
-import org.argeo.api.acr.ldap.LdapObjs;
+import org.argeo.api.acr.ldap.LdapAttr;
+import org.argeo.api.acr.ldap.LdapObj;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.cms.acr.AbstractContent;
@@ -50,9 +50,9 @@ abstract class AbstractDirectoryContent extends AbstractContent {
                Set<QName> keys = new TreeSet<>(NamespaceUtils.QNAME_COMPARATOR);
                keys: for (Enumeration<String> it = properties.keys(); it.hasMoreElements();) {
                        String key = it.nextElement();
-                       if (key.equalsIgnoreCase(LdapAttrs.objectClass.name()))
+                       if (key.equalsIgnoreCase(LdapAttr.objectClass.name()))
                                continue keys;
-                       if (key.equalsIgnoreCase(LdapAttrs.objectClasses.name()))
+                       if (key.equalsIgnoreCase(LdapAttr.objectClasses.name()))
                                continue keys;
                        ContentName name = new ContentName(ArgeoNamespace.LDAP_NAMESPACE_URI, key, provider);
                        keys.add(name);
@@ -64,12 +64,12 @@ abstract class AbstractDirectoryContent extends AbstractContent {
        public List<QName> getContentClasses() {
                Dictionary<String, Object> properties = doGetProperties();
                List<QName> contentClasses = new ArrayList<>();
-               String objectClass = properties.get(LdapAttrs.objectClass.name()).toString();
+               String objectClass = properties.get(LdapAttr.objectClass.name()).toString();
                contentClasses.add(new ContentName(ArgeoNamespace.LDAP_NAMESPACE_URI, objectClass, provider));
 
-               String[] objectClasses = properties.get(LdapAttrs.objectClasses.name()).toString().split("\\n");
+               String[] objectClasses = properties.get(LdapAttr.objectClasses.name()).toString().split("\\n");
                objectClasses: for (String oc : objectClasses) {
-                       if (LdapObjs.top.name().equalsIgnoreCase(oc))
+                       if (LdapObj.top.name().equalsIgnoreCase(oc))
                                continue objectClasses;
                        if (objectClass.equalsIgnoreCase(oc))
                                continue objectClasses;