inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
104818: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104759: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104650: Merged DEV to V4.2-BUG-FIX (4.2.5)
            104535 : MNT-13522: Remove unused SitesCannedQuery
               - Removed unused classes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104876 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-05-26 21:54:03 +00:00
parent 683c831806
commit 95a81a4fe7
7 changed files with 275 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
source/java/org/alfresco/repo/site/SiteMembersCannedQuery.java
View File

@@ -96,7 +96,7 @@ public class SiteMembersCannedQuery extends AbstractCannedQuery<SiteMembership>
{
this.siteShortName = siteShortName;
this.siteInfo = siteService.getSite(siteShortName);
this.siteMembers = sortPairs != null && sortPairs.size() > 0 ? new TreeSet<SiteMembership>(new SiteMembershipComparator(sortPairs)) : new HashSet<SiteMembership>();
this.siteMembers = sortPairs != null && sortPairs.size() > 0 ? new TreeSet<SiteMembership>(new SiteMembershipComparator(sortPairs, SiteMembershipComparator.Type.MEMBERS)) : new HashSet<SiteMembership>();
}
@Override
@@ -140,153 +140,4 @@ public class SiteMembersCannedQuery extends AbstractCannedQuery<SiteMembership>
{
}
}
private static class SiteMembershipComparator implements Comparator<SiteMembership>
{
private List<Pair<? extends Object, SortOrder>> sortPairs;
private static Collator collator = Collator.getInstance();
public SiteMembershipComparator(List<Pair<? extends Object, SortOrder>> sortPairs)
{
if(sortPairs.size() < 1)
{
throw new IllegalArgumentException("Must provide at least one sort criterion");
}
this.sortPairs = sortPairs;
}
private <T extends Object> int safeCompare(Comparable<T> o1, T o2)
{
int ret = 0;
if(o1 == null)
{
if(o2 == null)
{
ret = 0;
}
else
{
ret = -1;
}
}
else
{
if(o2 == null)
{
ret = 1;
}
else
{
ret = o1.compareTo(o2);
}
}
return ret;
}
private int safeCompare(String s1, String s2)
{
int ret = 0;
if(s1 == null)
{
if(s2 == null)
{
ret = 0;
}
else
{
ret = -1;
}
}
else
{
if(s2 == null)
{
ret = 1;
}
else
{
ret = collator.compare(s1, s2);
}
}
return ret;
}
@Override
public int compare(SiteMembership o1, SiteMembership o2)
{
String personId1 = o1.getPersonId();
String personId2 = o2.getPersonId();
SiteInfo siteInfo1 = o1.getSiteInfo();
SiteInfo siteInfo2 = o2.getSiteInfo();
String shortName1 = siteInfo1.getShortName();
String shortName2 = siteInfo2.getShortName();
String firstName1 = o1.getFirstName();
String firstName2 = o2.getFirstName();
String lastName1 = o1.getLastName();
String lastName2 = o2.getLastName();
String siteRole1 = o1.getRole();
String siteRole2 = o2.getRole();
int personId = safeCompare(personId1, personId2);
int firstName = safeCompare(firstName1, firstName2);
int siteShortName = safeCompare(shortName1, shortName2);
int lastName = safeCompare(lastName1, lastName2);
int siteRole = safeCompare(siteRole1, siteRole2);
if(siteRole == 0 && siteShortName == 0 && personId == 0)
{
// equals contract
return 0;
}
int ret = 0;
for(Pair<? extends Object, SortOrder> pair : sortPairs)
{
Object name = pair.getFirst();
SortOrder sortOrder = pair.getSecond();
int multiplier = sortOrder.equals(SortOrder.ASCENDING) ? 1 : -1;
if(name.equals(SiteService.SortFields.FirstName))
{
ret = firstName * multiplier;
}
else if(name.equals(SiteService.SortFields.LastName))
{
if(lastName1 == null || lastName2 == null)
{
continue;
}
ret = lastName * multiplier;
}
else if(name.equals(SiteService.SortFields.Role))
{
if(siteRole1 == null || siteRole2 == null)
{
continue;
}
ret = siteRole * multiplier;
}
else if(name.equals(SiteService.SortFields.Username))
{
if(personId1 == null || personId2 == null)
{
continue;
}
ret = personId * multiplier;
}
if(ret != 0)
{
break;
}
}
return ret;
}
}
}