honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 18:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced usage of java.util.Locale with com.ibm.icu.ULocale

Browse Source 
Closes #2290
This commit is contained in:
Martijn van Groningen 2012-09-27 10:16:05 +02:00
parent e0aad9bb83
commit 32e0bcff22
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/elasticsearch/index/analysis/IcuCollationTokenFilterFactory.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.index.analysis;
import com.ibm.icu.text.Collator;
import com.ibm.icu.text.RuleBasedCollator;
import com.ibm.icu.util.ULocale;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.collation.ICUCollationKeyFilter;
import org.elasticsearch.ElasticSearchIllegalArgumentException;
@ -33,7 +34,6 @@ import org.elasticsearch.index.Index;
import org.elasticsearch.index.settings.IndexSettings;
import java.io.IOException;
import java.util.Locale;
/**
* An ICU based collation token filter. There are two ways to configure collation:
@ -79,17 +79,17 @@ public class IcuCollationTokenFilterFactory extends AbstractTokenFilterFactory {
} else {
String language = settings.get("language");
if (language != null) {
Locale locale;
ULocale locale;
String country = settings.get("country");
if (country != null) {
String variant = settings.get("variant");
if (variant != null) {
locale = new Locale(language, country, variant);
locale = new ULocale(language, country, variant);
} else {
locale = new Locale(language, country);
locale = new ULocale(language, country);
}
} else {
locale = new Locale(language);
locale = new ULocale(language);
}
collator = Collator.getInstance(locale);
} else {