inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +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

59
source/java/org/alfresco/util/AlfrescoCollator.java Normal file
View File

@@ -0,0 +1,59 @@
/*
* Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.util;
import java.text.Collator;
import java.text.ParseException;
import java.text.RuleBasedCollator;
import java.util.Locale;
/**
* Can be used to overwrite a RuleBaseCollator instance rules
*
* @author sergey.shcherbovich
*/
public class AlfrescoCollator
{
public static Collator getInstance(Locale locale)
{
return updateCollatorRules(Collator.getInstance(locale));
}
// update RuleBasedCollator rules to change order of characters during comparison
// MNT-10169 fix
private static synchronized 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)
{
return collator;
}
}
return collator;
}
}