diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 49ca319..ba9b21d 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,6 @@ - + + @@ -66,7 +67,8 @@ - + + @@ -133,7 +135,8 @@ - + + @@ -200,7 +203,8 @@ - + + @@ -267,16 +271,11 @@ - - uses - uses - - uses - - + + @@ -343,7 +342,8 @@ - + + @@ -410,7 +410,8 @@ - + + @@ -477,7 +478,8 @@ - + + diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java index 0a4d780..d7d34d8 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java @@ -30,7 +30,6 @@ import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.shared.BeanUserInOrgGro import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.shared.CkanConnectorAccessPoint; import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.shared.ManageProductResponse; import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.OrganizationBean; -import org.gcube.portlets.widgets.mpformbuilder.shared.catalogue.OrganizationBeanProfile; import org.gcube.vomanagement.usermanagement.GroupManager; import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager; @@ -300,20 +299,20 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem * @param username the username * @return the list */ - private List fetchUserGroups(String context, String username) { + private List fetchUserGroups(String context, String username) { - List toReturn = null; + List toReturn = null; logger.info("Preloading user's groups"); try{ DataCatalogue catalogue = getCatalogue(context); - toReturn = new ArrayList(); + toReturn = new ArrayList(); Map> mapRoleGroup = catalogue.getUserRoleByGroup(username); Set>> set = mapRoleGroup.entrySet(); for (Entry> entry : set) { Set> subSet = entry.getValue().entrySet(); for (Entry subEntry : subSet) { - toReturn.add(new OrganizationBeanProfile(subEntry.getKey().getTitle(), subEntry.getKey().getName(), false)); + toReturn.add(new OrganizationBean(subEntry.getKey().getTitle(), subEntry.getKey().getName(), false)); } }