lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [lucenenet] 02/02: Upgraded to ICU4N 60.1.0-alpha.46
Date Sat, 27 Jul 2019 13:23:28 GMT
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 50e21e4c8ca416afdfc08950e221075ebc4db394
Author: Shad Storhaug <shad@shadstorhaug.com>
AuthorDate: Sat Jul 27 19:18:56 2019 +0700

    Upgraded to ICU4N 60.1.0-alpha.46
---
 build/Dependencies.props                                           | 2 +-
 .../Analysis/Icu/Segmentation/BreakIteratorWrapper.cs              | 6 +++---
 .../Analysis/Icu/Segmentation/CompositeBreakIterator.cs            | 7 ++++---
 .../Analysis/Icu/Segmentation/DefaultICUTokenizerConfig.cs         | 2 +-
 .../Analysis/Icu/Segmentation/ICUTokenizerFactory.cs               | 7 ++++---
 .../Analysis/Icu/Segmentation/ScriptIterator.cs                    | 5 +++--
 .../Analysis/Icu/TokenAttributes/ScriptAttribute.cs                | 2 +-
 .../Analysis/Icu/TokenAttributes/ScriptAttributeImpl.cs            | 2 +-
 .../Analysis/Icu/Segmentation/TestICUTokenizer.cs                  | 2 +-
 9 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/build/Dependencies.props b/build/Dependencies.props
index 213ad1c..df3978f 100644
--- a/build/Dependencies.props
+++ b/build/Dependencies.props
@@ -1,7 +1,7 @@
 <Project> 
   <PropertyGroup Label="NuGet Package Reference Versions">
     <Antlr3RuntimePackageVersion>3.5.1</Antlr3RuntimePackageVersion>
-    <ICU4NPackageVersion>60.1.0-alpha.19.ga158055102</ICU4NPackageVersion>
+    <ICU4NPackageVersion>60.1.0-alpha.46</ICU4NPackageVersion>
     <ICU4NCollationPackageVersion>$(ICU4NPackageVersion)</ICU4NCollationPackageVersion>
     <ICU4NCurrencyDataPackageVersion>$(ICU4NPackageVersion)</ICU4NCurrencyDataPackageVersion>
     <ICU4NLanguageDataPackageVersion>$(ICU4NPackageVersion)</ICU4NLanguageDataPackageVersion>
diff --git a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/BreakIteratorWrapper.cs
b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/BreakIteratorWrapper.cs
index 261d3c4..2b4db33 100644
--- a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/BreakIteratorWrapper.cs
+++ b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/BreakIteratorWrapper.cs
@@ -1,5 +1,5 @@
 // Lucene version compatibility level 7.1.0
-using ICU4N.Lang;
+using ICU4N;
 using ICU4N.Support.Text;
 using ICU4N.Text;
 
@@ -157,9 +157,9 @@ namespace Lucene.Net.Analysis.Icu.Segmentation
                 {
                     codepoint = UTF16.CharAt(m_text, 0, end, begin);
 
-                    if (UCharacter.IsDigit(codepoint))
+                    if (UChar.IsDigit(codepoint))
                         return ICU4N.Text.RuleStatus.WordNumber;
-                    else if (UCharacter.IsLetter(codepoint))
+                    else if (UChar.IsLetter(codepoint))
                     {
                         // TODO: try to separately specify ideographic, kana? 
                         // [currently all bundled as letter for this case]
diff --git a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/CompositeBreakIterator.cs
b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/CompositeBreakIterator.cs
index 85ebf55..15b6fcd 100644
--- a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/CompositeBreakIterator.cs
+++ b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/CompositeBreakIterator.cs
@@ -1,5 +1,6 @@
 // Lucene version compatibility level 7.1.0
-using ICU4N.Lang;
+using ICU4N;
+using ICU4N.Globalization;
 using ICU4N.Text;
 
 namespace Lucene.Net.Analysis.Icu.Segmentation
@@ -20,7 +21,7 @@ namespace Lucene.Net.Analysis.Icu.Segmentation
      * See the License for the specific language governing permissions and
      * limitations under the License.
      */
-    
+
     /// <summary>
     /// An internal <see cref="BreakIterator"/> for multilingual text, following recommendations
     /// from: UAX #29: Unicode Text Segmentation. (http://unicode.org/reports/tr29/)
@@ -41,7 +42,7 @@ namespace Lucene.Net.Analysis.Icu.Segmentation
     internal sealed class CompositeBreakIterator
     {
         private readonly ICUTokenizerConfig config;
-        private readonly BreakIteratorWrapper[] wordBreakers = new BreakIteratorWrapper[1
+ UCharacter.GetIntPropertyMaxValue(UProperty.Script)];
+        private readonly BreakIteratorWrapper[] wordBreakers = new BreakIteratorWrapper[1
+ UChar.GetIntPropertyMaxValue(UProperty.Script)];
 
         private BreakIteratorWrapper rbbi;
         private readonly ScriptIterator scriptIterator;
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 04908c7..3fb7334 100644
--- a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/DefaultICUTokenizerConfig.cs
+++ b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/DefaultICUTokenizerConfig.cs
@@ -1,5 +1,5 @@
 // Lucene version compatibility level 7.1.0
-using ICU4N.Lang;
+using ICU4N.Globalization;
 using ICU4N.Text;
 using ICU4N.Util;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/ICUTokenizerFactory.cs
b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/ICUTokenizerFactory.cs
index 95a2782..ac2dce0 100644
--- a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/ICUTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/ICUTokenizerFactory.cs
@@ -1,5 +1,6 @@
 // Lucene version compatibility level < 7.1.0
-using ICU4N.Lang;
+using ICU4N;
+using ICU4N.Globalization;
 using ICU4N.Text;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Support;
@@ -87,7 +88,7 @@ namespace Lucene.Net.Analysis.Icu.Segmentation
                     int colonPos = scriptAndResourcePath.IndexOf(":");
                     string scriptCode = scriptAndResourcePath.Substring(0, colonPos - 0).Trim();
                     string resourcePath = scriptAndResourcePath.Substring(colonPos + 1).Trim();
-                    tailored[UCharacter.GetPropertyValueEnum(UProperty.Script, scriptCode)]
= resourcePath;
+                    tailored[UChar.GetPropertyValueEnum(UProperty.Script, scriptCode)] =
resourcePath;
                 }
             }
             cjkAsWords = GetBoolean(args, "cjkAsWords", true);
@@ -117,7 +118,7 @@ namespace Lucene.Net.Analysis.Icu.Segmentation
             public DefaultICUTokenizerConfigAnonymousHelper(bool cjkAsWords, bool myanmarAsWords,
IDictionary<int, string> tailored, IResourceLoader loader)
                 : base(cjkAsWords, myanmarAsWords)
             {
-                breakers = new BreakIterator[1 + UCharacter.GetIntPropertyMaxValue(UProperty.Script)];
+                breakers = new BreakIterator[1 + UChar.GetIntPropertyMaxValue(UProperty.Script)];
                 foreach (var entry in tailored)
                 {
                     int code = entry.Key;
diff --git a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/ScriptIterator.cs b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/ScriptIterator.cs
index 26ba107..8a2071f 100644
--- a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/ScriptIterator.cs
+++ b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/ScriptIterator.cs
@@ -1,5 +1,6 @@
 // Lucene version compatibility level 7.1.0
-using ICU4N.Lang;
+using ICU4N;
+using ICU4N.Globalization;
 using ICU4N.Text;
 
 namespace Lucene.Net.Analysis.Icu.Segmentation
@@ -112,7 +113,7 @@ namespace Lucene.Net.Analysis.Icu.Segmentation
                  * value — should inherit the script value of its base character.
                  */
                 if (IsSameScript(scriptCode, sc)
-                    || UCharacter.GetType(ch) == UCharacterCategory.NonSpacingMark)
+                    || UChar.GetUnicodeCategory(ch) == UUnicodeCategory.NonSpacingMark)
                 {
                     index += UTF16.GetCharCount(ch);
 
diff --git a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/TokenAttributes/ScriptAttribute.cs b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/TokenAttributes/ScriptAttribute.cs
index 6ce9e8b..d971ee1 100644
--- a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/TokenAttributes/ScriptAttribute.cs
+++ b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/TokenAttributes/ScriptAttribute.cs
@@ -30,7 +30,7 @@ namespace Lucene.Net.Analysis.Icu.TokenAttributes
         /// <summary>
         /// Gets or Sets the numeric code for this script value.
         /// <para/>
-        /// This is the constant value from <see cref="ICU4N.Lang.UScript"/>.
+        /// This is the constant value from <see cref="ICU4N.Globalization.UScript"/>.
         /// </summary>
         int Code { get; set; }
 
diff --git a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/TokenAttributes/ScriptAttributeImpl.cs
b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/TokenAttributes/ScriptAttributeImpl.cs
index 49ebb71..2612ebf 100644
--- a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/TokenAttributes/ScriptAttributeImpl.cs
+++ b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/TokenAttributes/ScriptAttributeImpl.cs
@@ -1,4 +1,4 @@
-using ICU4N.Lang;
+using ICU4N.Globalization;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
 
diff --git a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/Segmentation/TestICUTokenizer.cs
b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/Segmentation/TestICUTokenizer.cs
index 1033ce9..7439b63 100644
--- a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/Segmentation/TestICUTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/Segmentation/TestICUTokenizer.cs
@@ -1,5 +1,5 @@
 // Lucene version compatibility level < 7.1.0
-using ICU4N.Lang;
+using ICU4N.Globalization;
 using Lucene.Net.Analysis.Icu.TokenAttributes;
 using Lucene.Net.Support;
 using Lucene.Net.Support.Threading;


Mime
View raw message