Merge branch 'apache:master' into feature/async-replicator-client

Author: NehanPathan

src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKBigramFilter.cs

@@ -84,7 +84,7 @@ public sealed class CJKBigramFilter : TokenFilter
         private static readonly string HANGUL_TYPE = StandardTokenizer.TOKEN_TYPES[StandardTokenizer.HANGUL];
 
         // sentinel value for ignoring a script
-        private static readonly string NO = "<NO>";
+        private const string NO = "<NO>";
 
         // these are set to either their type or NO if we want to pass them thru
         private readonly string doHan;

src/Lucene.Net.Analysis.Common/Analysis/En/KStemData1.cs

@@ -48,8 +48,10 @@ internal class KStemData1
         private KStemData1()
         {
         }
+
+        // LUCENENET specific - made readonly
         // KStemData1 ... KStemData8 are created from "head_word_list.txt"
-        internal static string[] data = new string[] {
+        internal static readonly string[] data = {
             "aback","abacus","abandon","abandoned","abase",
             "abash","abate","abattoir","abbess","abbey",
             "abbot","abbreviate","abbreviation","abc","abdicate",

src/Lucene.Net.Analysis.Common/Analysis/En/KStemData2.cs

@@ -47,7 +47,9 @@ internal class KStemData2
         private KStemData2()
         {
         }
-        internal static string[] data = new string[] {
+
+        // LUCENENET specific - made readonly
+        internal static readonly string[] data = {
             "cash","cashew","cashier","cashmere","casing",
             "casino","cask","casket","casque","cassava",
             "casserole","cassette","cassock","cassowary","cast",

src/Lucene.Net.Analysis.Common/Analysis/En/KStemData3.cs

@@ -47,7 +47,9 @@ internal class KStemData3
         private KStemData3()
         {
         }
-        internal static string[] data = new string[] {
+
+        // LUCENENET specific - made readonly
+        internal static readonly string[] data = {
             "distasteful","distemper","distempered","distend","distension",
             "distil","distill","distillation","distiller","distillery",
             "distinct","distinction","distinctive","distinguish","distinguishable",

src/Lucene.Net.Analysis.Common/Analysis/En/KStemData4.cs

@@ -47,7 +47,9 @@ internal class KStemData4
         private KStemData4()
         {
         }
-        internal static string[] data = new string[] {
+
+        // LUCENENET specific - made readonly
+        internal static readonly string[] data = {
             "granular","granulate","granule","grape","grapefruit",
             "grapeshot","grapevine","graph","graphic","graphical",
             "graphically","graphite","graphology","grapnel","grapple",

src/Lucene.Net.Analysis.Common/Analysis/En/KStemData5.cs

@@ -47,7 +47,9 @@ internal class KStemData5
         private KStemData5()
         {
         }
-        internal static string[] data = new string[] {
+
+        // LUCENENET specific - made readonly
+        internal static readonly string[] data = {
             "lock","locker","locket","lockjaw","locknut",
             "lockout","locks","locksmith","lockstitch","lockup",
             "loco","locomotion","locomotive","locum","locus",

src/Lucene.Net.Analysis.Common/Analysis/En/KStemData6.cs

@@ -47,7 +47,9 @@ internal class KStemData6
         private KStemData6()
         {
         }
-        internal static string[] data = new string[] {
+
+        // LUCENENET specific - made readonly
+        internal static readonly string[] data = {
             "pedant","pedantic","pedantry","peddle","peddler",
             "pederast","pederasty","pedestal","pedestrian","pediatrician",
             "pediatrics","pedicab","pedicel","pedicure","pedigree",

src/Lucene.Net.Analysis.Common/Analysis/En/KStemData7.cs

@@ -47,7 +47,9 @@ internal class KStemData7
         private KStemData7()
         {
         }
-        internal static string[] data = new string[] {
+
+        // LUCENENET specific - made readonly
+        internal static readonly string[] data = {
             "rupee","rupture","rural","ruritanian","ruse",
             "rush","rushes","rushlight","rusk","russet",
             "rust","rustic","rusticate","rustication","rustle",

src/Lucene.Net.Analysis.Common/Analysis/En/KStemData8.cs

@@ -47,7 +47,9 @@ internal class KStemData8
         private KStemData8()
         {
         }
-        internal static string[] data = new string[] {
+
+        // LUCENENET specific - made readonly
+        internal static readonly string[] data = {
             "tenor","tenpin","tense","tensile","tension",
             "tent","tentacle","tentative","tenterhooks","tenuity",
             "tenuous","tenure","tepee","tepid","tequila",

src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CapitalizationFilter.cs

@@ -34,8 +34,8 @@ namespace Lucene.Net.Analysis.Miscellaneous
     /// </summary>
     public sealed class CapitalizationFilter : TokenFilter
     {
-        public static readonly int DEFAULT_MAX_WORD_COUNT = int.MaxValue;
-        public static readonly int DEFAULT_MAX_TOKEN_LENGTH = int.MaxValue;
+        public const int DEFAULT_MAX_WORD_COUNT = int.MaxValue;
+        public const int DEFAULT_MAX_TOKEN_LENGTH = int.MaxValue;
 
         private readonly bool onlyFirstWord;
         private readonly CharArraySet keep;