Merge tag 'v2.3.28' into testing

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

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/directory/RoleContent.java b/org.argeo.cms/src/org/argeo/cms/acr/directory/RoleContent.java
index 64feb1d6735955310ee458a00c50a53adbe842c8..c72ea37607c92ff26369aeee211bf0ae83286728 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/acr/directory/RoleContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/directory/RoleContent.java
@@ -7,22 +7,24 @@ import javax.xml.namespace.QName;
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentName;
 import org.argeo.api.acr.spi.ProvidedSession;
+import org.argeo.api.cms.directory.CmsRole;
 import org.argeo.api.cms.directory.UserDirectory;
 import org.osgi.service.useradmin.Role;
 
 class RoleContent extends AbstractDirectoryContent {
 
        private HierarchyUnitContent parent;
-       private Role role;
+       private CmsRole role;
 
        public RoleContent(ProvidedSession session, DirectoryContentProvider provider, HierarchyUnitContent parent,
-                       Role role) {
+                       CmsRole role) {
                super(session, provider);
                this.parent = parent;
                this.role = role;
        }
 
        @Override
+       @Deprecated
        Dictionary<String, Object> doGetProperties() {
                return role.getProperties();
        }
@@ -41,8 +43,11 @@ class RoleContent extends AbstractDirectoryContent {
        @SuppressWarnings("unchecked")
        @Override
        public <A> A adapt(Class<A> clss) {
-               if (Role.class.isAssignableFrom(clss))
+               if (CmsRole.class.isAssignableFrom(clss))
                        return (A) role;
+               // TODO do we need this?
+//             if (Role.class.isAssignableFrom(clss))
+//                     return (A) role;
                return super.adapt(clss);
        }