X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fdirectory%2FRoleContent.java;h=64feb1d6735955310ee458a00c50a53adbe842c8;hb=84914c5224fe7d441cc10f30b8418bf4ac4b0a0f;hp=3b1ae46b29b5dfd31fe3cbc89f00c72bcffa2b0d;hpb=54df376a9c2dd458a82eaa09bfbb718fe699dd0d;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 3b1ae46b2..64feb1d67 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,10 +7,8 @@ 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.cms.osgi.useradmin.UserDirectory;
-import org.osgi.service.useradmin.Group;
+import org.argeo.api.cms.directory.UserDirectory;
 import org.osgi.service.useradmin.Role;
-import org.osgi.service.useradmin.User;
 
 class RoleContent extends AbstractDirectoryContent {
 
@@ -43,11 +41,7 @@ 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 (Role.class.isAssignableFrom(clss))
 			return (A) role;
 		return super.adapt(clss);
 	}