Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-04-26 13:03:25 +00:00
parent 8674e2bfc8
commit dc6b2852d0
830 changed files with 142585 additions and 142585 deletions

View File

@@ -1,125 +1,125 @@
package org.alfresco.repo.site;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import org.alfresco.model.ContentModel;
import org.alfresco.query.AbstractCannedQuery;
import org.alfresco.query.CannedQueryParameters;
import org.alfresco.query.CannedQuerySortDetails;
import org.alfresco.query.CannedQuerySortDetails.SortOrder;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteService.SiteMembersCallback;
import org.alfresco.util.Pair;
/**
* A canned query for retrieving the members of a site.
*
* @author steveglover
*
*/
//TODO currently have to read all sites into memory for sorting purposes. Find a way that doesn't involve doing this.
public class SiteMembersCannedQuery extends AbstractCannedQuery<SiteMembership>
{
private NodeService nodeService;
private PersonService personService;
private SiteService siteService;
protected SiteMembersCannedQuery(SiteService siteService, PersonService personService, NodeService nodeService, CannedQueryParameters parameters)
{
super(parameters);
this.personService = personService;
this.nodeService = nodeService;
this.siteService = siteService;
}
@Override
protected List<SiteMembership> queryAndFilter(CannedQueryParameters parameters)
{
SiteMembersCannedQueryParams paramBean = (SiteMembersCannedQueryParams)parameters.getParameterBean();
String siteShortName = paramBean.getShortName();
boolean collapseGroups = paramBean.isCollapseGroups();
CannedQuerySortDetails sortDetails = parameters.getSortDetails();
List<Pair<? extends Object, SortOrder>> sortPairs = sortDetails.getSortPairs();
final CQSiteMembersCallback callback = new CQSiteMembersCallback(siteShortName, sortPairs);
siteService.listMembers(siteShortName, null, null, collapseGroups, callback);
callback.done();
return callback.getSiteMembers();
}
@Override
protected boolean isApplyPostQuerySorting()
{
// already sorted as a side effect by CQSiteMembersCallback
return false;
}
private class CQSiteMembersCallback implements SiteMembersCallback
{
private String siteShortName;
private SiteInfo siteInfo;
private Set<SiteMembership> siteMembers;
CQSiteMembersCallback(String siteShortName, List<Pair<? extends Object, SortOrder>> sortPairs)
{
this.siteShortName = siteShortName;
this.siteInfo = siteService.getSite(siteShortName);
this.siteMembers = sortPairs != null && sortPairs.size() > 0 ? new TreeSet<SiteMembership>(new SiteMembershipComparator(sortPairs, SiteMembershipComparator.Type.MEMBERS)) : new HashSet<SiteMembership>();
}
@Override
public void siteMember(String authority, String permission)
{
String firstName = null;
String lastName = null;
if(personService.personExists(authority))
{
NodeRef nodeRef = personService.getPerson(authority);
firstName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_FIRSTNAME);
lastName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_LASTNAME);
}
SiteMembership siteMember = new SiteMembership(siteInfo, authority, firstName, lastName, permission);
siteMembers.add(siteMember);
}
@Override
public boolean isDone()
{
return false; // need to read in all site members for sort
}
List<SiteMembership> getSiteMembers()
{
// "drain" the site memberships into a (sorted) list
List<SiteMembership> siteMemberships = new ArrayList<SiteMembership>(siteMembers.size());
Iterator<SiteMembership> it = siteMembers.iterator();
while(it.hasNext())
{
siteMemberships.add(it.next());
it.remove();
}
return siteMemberships;
}
void done()
{
}
}
}
package org.alfresco.repo.site;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import org.alfresco.model.ContentModel;
import org.alfresco.query.AbstractCannedQuery;
import org.alfresco.query.CannedQueryParameters;
import org.alfresco.query.CannedQuerySortDetails;
import org.alfresco.query.CannedQuerySortDetails.SortOrder;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteService.SiteMembersCallback;
import org.alfresco.util.Pair;
/**
* A canned query for retrieving the members of a site.
*
* @author steveglover
*
*/
//TODO currently have to read all sites into memory for sorting purposes. Find a way that doesn't involve doing this.
public class SiteMembersCannedQuery extends AbstractCannedQuery<SiteMembership>
{
private NodeService nodeService;
private PersonService personService;
private SiteService siteService;
protected SiteMembersCannedQuery(SiteService siteService, PersonService personService, NodeService nodeService, CannedQueryParameters parameters)
{
super(parameters);
this.personService = personService;
this.nodeService = nodeService;
this.siteService = siteService;
}
@Override
protected List<SiteMembership> queryAndFilter(CannedQueryParameters parameters)
{
SiteMembersCannedQueryParams paramBean = (SiteMembersCannedQueryParams)parameters.getParameterBean();
String siteShortName = paramBean.getShortName();
boolean collapseGroups = paramBean.isCollapseGroups();
CannedQuerySortDetails sortDetails = parameters.getSortDetails();
List<Pair<? extends Object, SortOrder>> sortPairs = sortDetails.getSortPairs();
final CQSiteMembersCallback callback = new CQSiteMembersCallback(siteShortName, sortPairs);
siteService.listMembers(siteShortName, null, null, collapseGroups, callback);
callback.done();
return callback.getSiteMembers();
}
@Override
protected boolean isApplyPostQuerySorting()
{
// already sorted as a side effect by CQSiteMembersCallback
return false;
}
private class CQSiteMembersCallback implements SiteMembersCallback
{
private String siteShortName;
private SiteInfo siteInfo;
private Set<SiteMembership> siteMembers;
CQSiteMembersCallback(String siteShortName, List<Pair<? extends Object, SortOrder>> sortPairs)
{
this.siteShortName = siteShortName;
this.siteInfo = siteService.getSite(siteShortName);
this.siteMembers = sortPairs != null && sortPairs.size() > 0 ? new TreeSet<SiteMembership>(new SiteMembershipComparator(sortPairs, SiteMembershipComparator.Type.MEMBERS)) : new HashSet<SiteMembership>();
}
@Override
public void siteMember(String authority, String permission)
{
String firstName = null;
String lastName = null;
if(personService.personExists(authority))
{
NodeRef nodeRef = personService.getPerson(authority);
firstName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_FIRSTNAME);
lastName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_LASTNAME);
}
SiteMembership siteMember = new SiteMembership(siteInfo, authority, firstName, lastName, permission);
siteMembers.add(siteMember);
}
@Override
public boolean isDone()
{
return false; // need to read in all site members for sort
}
List<SiteMembership> getSiteMembers()
{
// "drain" the site memberships into a (sorted) list
List<SiteMembership> siteMemberships = new ArrayList<SiteMembership>(siteMembers.size());
Iterator<SiteMembership> it = siteMembers.iterator();
while(it.hasNext())
{
siteMemberships.add(it.next());
it.remove();
}
return siteMemberships;
}
void done()
{
}
}
}