X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fdirectory%2FRoleContent.java;h=c72ea37607c92ff26369aeee211bf0ae83286728;hb=HEAD;hp=356e272c90adeae7db1d120f238be7f83d239f06;hpb=feddb4be70a8304dd4a533efee6e14c22691b500;p=lgpl%2Fargeo-commons.git

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 356e272c9..c72ea3760 100644
--- 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,24 +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.Group;
 import org.osgi.service.useradmin.Role;
-import org.osgi.service.useradmin.User;
 
 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();
 	}
@@ -43,12 +43,11 @@ class RoleContent extends AbstractDirectoryContent {
 	@SuppressWarnings("unchecked")
 	@Override
 	public <A> A adapt(Class<A> clss) {
-		if (clss.equals(Group.class))
-			return (A) role;
-		else if (clss.equals(User.class))
-			return (A) role;
-		else if (clss.equals(Role.class))
+		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);
 	}