This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit f6e99610981f183b731e1aa9ace401b6e859cc58 Author: Shad Storhaug <[email protected]> AuthorDate: Fri Jun 26 15:09:12 2020 +0700 Lucene.Net.ICU, Lucene.Net.Tests.ICU: Upgraded to utilize UCultureInfo from ICU4N --- .../Analysis/Icu/Segmentation/DefaultICUTokenizerConfig.cs | 3 +-- .../Collation/ICUCollationKeyFilterFactory.cs | 4 ++-- .../Collation/TestICUCollationKeyFilterFactory.cs | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/DefaultICUTokenizerConfig.cs b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/DefaultICUTokenizerConfig.cs index fb1cff9..eaf1ee5 100644 --- a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/DefaultICUTokenizerConfig.cs +++ b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/DefaultICUTokenizerConfig.cs @@ -1,7 +1,6 @@ // Lucene version compatibility level 7.1.0 using ICU4N.Globalization; using ICU4N.Text; -using ICU4N.Util; using J2N; using Lucene.Net.Analysis.Standard; using System; @@ -61,7 +60,7 @@ namespace Lucene.Net.Analysis.Icu.Segmentation /// </summary> // we keep the cjk breaking separate, thats because it cannot be customized (because dictionary // is only triggered when kind = WORD, but kind = LINE by default and we have no non-evil way to change it) - private static readonly BreakIterator cjkBreakIterator = BreakIterator.GetWordInstance(ULocale.ROOT); + private static readonly BreakIterator cjkBreakIterator = BreakIterator.GetWordInstance(UCultureInfo.InvariantCulture); // TODO: if the wrong version of the ICU jar is used, loading these data files may give a strange error. // maybe add an explicit check? http://icu-project.org/apiref/icu4j/com/ibm/icu/util/VersionInfo.html diff --git a/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyFilterFactory.cs b/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyFilterFactory.cs index 7e7a1b8..4ba29c2 100644 --- a/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyFilterFactory.cs +++ b/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyFilterFactory.cs @@ -1,6 +1,6 @@ // lucene version compatibility level: 4.8.1 +using ICU4N.Globalization; using ICU4N.Text; -using ICU4N.Util; using Lucene.Net.Analysis; using Lucene.Net.Analysis.Util; using Lucene.Net.Support; @@ -208,7 +208,7 @@ namespace Lucene.Net.Collation /// <returns>The appropriate collator for the locale.</returns> private Collator CreateFromLocale(string localeID) { - return Collator.GetInstance(new ULocale(localeID)); + return Collator.GetInstance(new UCultureInfo(localeID)); } /// <summary> diff --git a/src/Lucene.Net.Tests.Analysis.ICU/Collation/TestICUCollationKeyFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.ICU/Collation/TestICUCollationKeyFilterFactory.cs index 12e7c18..b2948d9 100644 --- a/src/Lucene.Net.Tests.Analysis.ICU/Collation/TestICUCollationKeyFilterFactory.cs +++ b/src/Lucene.Net.Tests.Analysis.ICU/Collation/TestICUCollationKeyFilterFactory.cs @@ -1,5 +1,5 @@ -using ICU4N.Text; -using ICU4N.Util; +using ICU4N.Globalization; +using ICU4N.Text; using J2N; using J2N.Text; using Lucene.Net.Analysis; @@ -227,7 +227,7 @@ namespace Lucene.Net.Collation [Test] public void TestCustomRules() { - RuleBasedCollator baseCollator = (RuleBasedCollator)Collator.GetInstance(new ULocale("de_DE")); + RuleBasedCollator baseCollator = (RuleBasedCollator)Collator.GetInstance(new UCultureInfo("de_DE")); String DIN5007_2_tailorings = "& ae , a\u0308 & AE , A\u0308" +
