inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
68121: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67187: MNT-10169 : Sort order by name is not always correct when the file name has alphanumeric characters
         - Fix for GetChildrenCannedQueryTest failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68406 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-04-30 16:09:19 +00:00
parent cfd0fd6436
commit cf5e452e77
3 changed files with 64 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQuery.java
View File

@@ -20,8 +20,6 @@ package org.alfresco.repo.node.getchildren;
import java.io.Serializable;
import java.text.Collator;
import java.text.ParseException;
import java.text.RuleBasedCollator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -61,6 +59,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.AlfrescoCollator;
import org.alfresco.util.Pair;
import org.alfresco.util.ParameterCheck;
import org.apache.commons.logging.Log;
@@ -374,7 +373,7 @@ public class GetChildrenCannedQuery extends AbstractCannedQueryPermissions<NodeR
{
this.sortProps = sortProps;
// try to overrider collator comparison rules
this.collator = updateCollatorRules(Collator.getInstance(I18NUtil.getContentLocale()));
this.collator = AlfrescoCollator.getInstance(I18NUtil.getContentLocale());
}
public int compare(FilterSortNode n1, FilterSortNode n2)
@@ -452,32 +451,6 @@ public class GetChildrenCannedQuery extends AbstractCannedQueryPermissions<NodeR
}
}
// update RuleBasedCollator rules to change order of characters during comparison
// MNT-10169 fix
private Collator updateCollatorRules(Collator collator)
{
if (collator instanceof RuleBasedCollator)
{
try
{
// get current collator rules
String collatorRules = ((RuleBasedCollator)collator).getRules();
// we shoudn't ignore space character in character comparison - put it before u0021 character
String newCollatorRules = collatorRules.replaceAll("<'\u0021'", "<'\u0020'<'\u0021'");
// create new collator with overridden rules
return new RuleBasedCollator(newCollatorRules);
}
catch(ParseException e)
{
if (logger.isWarnEnabled())
{
logger.warn("Error on overwriting RuleBasedCollator rules " + e.getMessage());
}
}
}
return collator;
}
private boolean includeAspects(NodeRef nodeRef, Set<QName> inclusiveAspects, Set<QName> exclusiveAspects)
{
if (inclusiveAspects == null && exclusiveAspects == null)