Use CultureInfo.DefaultInvariant instead of just the Default

svn path=/trunk/mcs/; revision=43643

diff --git a/mcs/class/System.Web/System.Web.Compilation/AspComponentFoundry.cs b/mcs/class/System.Web/System.Web.Compilation/AspComponentFoundry.cs
index af0b8b6e92d2d7ce3dde558bc3cf12975d45457b..7b2fcd27fb2549f8b653c6aa736e06ef162a891f 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/AspComponentFoundry.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/AspComponentFoundry.cs
@@ -40,8 +40,8 @@ namespace System.Web.Compilation
 \r
                public AspComponentFoundry ()\r
                {\r
-                       foundries = new Hashtable (CaseInsensitiveHashCodeProvider.Default,\r
-                                                  CaseInsensitiveComparer.Default);\r
+                       foundries = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
+                                                  CaseInsensitiveComparer.DefaultInvariant);
 \r
                        Assembly sw = typeof (AspComponentFoundry).Assembly;\r
                        RegisterFoundry ("asp", sw, "System.Web.UI.WebControls");\r
@@ -150,8 +150,8 @@ namespace System.Web.Compilation
                        public CompoundFoundry (string tagPrefix)\r
                        {\r
                                this.tagPrefix = tagPrefix;\r
-                               tagnames = new Hashtable (CaseInsensitiveHashCodeProvider.Default,\r
-                                                          CaseInsensitiveComparer.Default);\r
+                               tagnames = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
+                                                          CaseInsensitiveComparer.DefaultInvariant);
                        }\r
 \r
                        public void Add (Foundry foundry)\r

diff --git a/mcs/class/System.Web/System.Web.Compilation/Directive.cs b/mcs/class/System.Web/System.Web.Compilation/Directive.cs
index ec3c3e1ada2b962eb59f95ed995d0028f9d95279..87c887e7b722da331d28f5d52a05bd711d50ba65 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/Directive.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/Directive.cs
@@ -30,6 +30,7 @@
 
 using System;
 using System.Collections;
+using System.Globalization;
 
 namespace System.Web.Compilation
 {
@@ -72,8 +73,8 @@ namespace System.Web.Compilation
                
                private static void InitHash ()
                {
-                       CaseInsensitiveHashCodeProvider provider = new CaseInsensitiveHashCodeProvider ();
-                       CaseInsensitiveComparer comparer =  new CaseInsensitiveComparer ();
+                       CaseInsensitiveHashCodeProvider provider = new CaseInsensitiveHashCodeProvider (CultureInfo.InvariantCulture);
+                       CaseInsensitiveComparer comparer =  new CaseInsensitiveComparer (CultureInfo.InvariantCulture);
 
                        directivesHash = new Hashtable (provider, comparer); 
 

diff --git a/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs b/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs
index 0663ffec1b7357b4840ed1e9103cf44b21330ed5..d668646130f8e48ec582fba0b101d78b0d3f05de 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs
@@ -51,8 +51,8 @@ namespace System.Web.Compilation
 
                void MakeHash ()
                {
-                       atts_hash = new Hashtable (CaseInsensitiveHashCodeProvider.Default,
-                                                  CaseInsensitiveComparer.Default);
+                       atts_hash = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
+                                                  CaseInsensitiveComparer.DefaultInvariant);
                        for (int i = 0; i < keys.Count; i++) {
                                CheckServerKey (keys [i]);
                                atts_hash.Add (keys [i], values [i]);
@@ -158,8 +158,8 @@ namespace System.Web.Compilation
                                return atts_hash;
 
                        if (tmp_hash == null)
-                               tmp_hash = new Hashtable (CaseInsensitiveHashCodeProvider.Default,
-                                                         CaseInsensitiveComparer.Default);
+                               tmp_hash = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
+                                                         CaseInsensitiveComparer.DefaultInvariant);
                        
                        tmp_hash.Clear ();
                        for (int i = keys.Count - 1; i >= 0; i--)

diff --git a/mcs/class/System.Web/System.Web.Configuration/BuildProviderCollection.cs b/mcs/class/System.Web/System.Web.Configuration/BuildProviderCollection.cs
index 55b2e33d288f17c8516f69916d3adeb03cf01bb3..5e5dbfcb1195c413921cd2163bc51a99939fae60 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/BuildProviderCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/BuildProviderCollection.cs
@@ -84,7 +84,7 @@ namespace System.Web.Configuration
 
                protected override bool CompareKeys (object key1, object key2)
                {
-                       return (0 == CaseInsensitiveComparer.Default.Compare ((string) key1, (string) key2));
+                       return (0 == CaseInsensitiveComparer.DefaultInvariant.Compare ((string) key1, (string) key2));
                }
 
                protected override ConfigurationElement CreateNewElement ()

diff --git a/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectoriesCollection.cs b/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectoriesCollection.cs
index 2a98d6258271e83e105322b7f3cadf6cdd7ab9a0..a0b3176c138ff596cd71f9ff2718d9a8d6ae1cc4 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectoriesCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectoriesCollection.cs
@@ -73,7 +73,7 @@ namespace System.Web.Configuration
 
                protected override bool CompareKeys (object key1, object key2)
                {
-                       return (0 == CaseInsensitiveComparer.Default.Compare ((string) key1, (string) key2));
+                       return (0 == CaseInsensitiveComparer.DefaultInvariant.Compare ((string) key1, (string) key2));
                }
 
                protected override ConfigurationElement CreateNewElement ()

diff --git a/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs b/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
index 42ee6f73c1ef4978c48a39cfbc5e1435fa7588e6..e1085c647bfffcd65b6df4f5acf8ab4932b43310 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
@@ -42,8 +42,8 @@ namespace System.Web.Configuration
 
                public CompilerCollection (CompilerCollection parent)
                {
-                       compilers = new Hashtable (CaseInsensitiveHashCodeProvider.Default,
-                                                  CaseInsensitiveComparer.Default);
+                       compilers = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
+                                                  CaseInsensitiveComparer.DefaultInvariant);
 
                        if (parent != null && parent.compilers != null) {
                                foreach (DictionaryEntry entry in parent.compilers)
@@ -121,7 +121,7 @@ namespace System.Web.Configuration
 
                protected override bool CompareKeys (object key1, object key2)
                {
-                       return (0 == CaseInsensitiveComparer.Default.Compare ((string) key1, (string) key2));
+                       return (0 == CaseInsensitiveComparer.DefaultInvariant.Compare ((string) key1, (string) key2));
                }
 
                protected override ConfigurationElement CreateNewElement ()

diff --git a/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilderCollection.cs b/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilderCollection.cs
index dc8635d853a8380193c84269c6b578c0f8196548..c8137450ba05ab04b83f5e3ae4ee636567adf3a9 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilderCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilderCollection.cs
@@ -86,7 +86,7 @@ namespace System.Web.Configuration
 
                protected override bool CompareKeys (object key1, object key2)
                {
-                       return (0 == CaseInsensitiveComparer.Default.Compare ((string) key1, (string) key2));
+                       return (0 == CaseInsensitiveComparer.DefaultInvariant.Compare ((string) key1, (string) key2));
                }
 
                protected override ConfigurationElement CreateNewElement ()

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FontUnit.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FontUnit.cs
index ea900c8a6a4c7e4baf05d4f0b04643dbe6b2d5bb..21a57a1bf87605d57859cfaf300fc0e0fb2def1e 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/FontUnit.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/FontUnit.cs
@@ -65,8 +65,8 @@ namespace System.Web.UI.WebControls
 \r
                static FontUnit ()\r
                {\r
-                       sizeTable = new Hashtable (CaseInsensitiveHashCodeProvider.Default,\r
-                                                  CaseInsensitiveComparer.Default);\r
+                       sizeTable = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
+                                                  CaseInsensitiveComparer.DefaultInvariant);
                        sizeTable.Add ("smaller", 2);\r
                        sizeTable.Add ("larger", 3);\r
                        sizeTable.Add ("xx-small", 4);\r

diff --git a/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs b/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
index 20e861a5de82f1fa7c03da2ea5502df0d682cb21..690adcd5ff8b3ee15e3347597024abae87ccad83 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
+++ b/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
@@ -35,8 +35,8 @@ namespace System.Web.UI{
 public class HtmlTextWriter : System.IO.TextWriter {\r
 \r
 static HtmlTextWriter(){\r
-       HtmlTextWriter._tagKeyLookupTable = new Hashtable(97,CaseInsensitiveHashCodeProvider.Default,\r
-                                                         CaseInsensitiveComparer.Default);\r
+       HtmlTextWriter._tagKeyLookupTable = new Hashtable(97,CaseInsensitiveHashCodeProvider.DefaultInvariant,
+                                                         CaseInsensitiveComparer.DefaultInvariant);
        HtmlTextWriter._tagNameLookupArray = new TagInformation[97];\r
        HtmlTextWriter.RegisterTag("", HtmlTextWriterTag.Unknown, TagType.Other);\r
        HtmlTextWriter.RegisterTag("a", HtmlTextWriterTag.A, TagType.Inline);\r
@@ -141,8 +141,8 @@ static HtmlTextWriter(){
 #else\r
        HtmlTextWriter._attrNameLookupArray = new AttributeInformation[40];\r
 #endif\r
-       HtmlTextWriter._attrKeyLookupTable = new Hashtable (HtmlTextWriter._attrNameLookupArray.Length, \r
-                                                               CaseInsensitiveHashCodeProvider.Default, CaseInsensitiveComparer.Default);\r
+       HtmlTextWriter._attrKeyLookupTable = new Hashtable (HtmlTextWriter._attrNameLookupArray.Length,
+                                       CaseInsensitiveHashCodeProvider.DefaultInvariant, CaseInsensitiveComparer.DefaultInvariant);
        HtmlTextWriter.RegisterAttribute("accesskey", HtmlTextWriterAttribute.Accesskey, true);\r
        HtmlTextWriter.RegisterAttribute("align", HtmlTextWriterAttribute.Align, false);\r
        HtmlTextWriter.RegisterAttribute("alt", HtmlTextWriterAttribute.Alt, true);\r
@@ -205,8 +205,8 @@ static HtmlTextWriter(){
 #else\r
        HtmlTextWriter._styleNameLookupArray = new String[14];\r
 #endif\r
-       HtmlTextWriter._styleKeyLookupTable = new Hashtable (HtmlTextWriter._styleNameLookupArray.Length,\r
-                                                               CaseInsensitiveHashCodeProvider.Default, CaseInsensitiveComparer.Default);\r
+       HtmlTextWriter._styleKeyLookupTable = new Hashtable (HtmlTextWriter._styleNameLookupArray.Length,
+                               CaseInsensitiveHashCodeProvider.DefaultInvariant, CaseInsensitiveComparer.DefaultInvariant);
        HtmlTextWriter.RegisterStyle("background-color", HtmlTextWriterStyle.BackgroundColor);\r
        HtmlTextWriter.RegisterStyle("background-image", HtmlTextWriterStyle.BackgroundImage);\r
        HtmlTextWriter.RegisterStyle("border-collapse", HtmlTextWriterStyle.BorderCollapse);\r

diff --git a/mcs/class/System.Web/System.Web.UI/RootBuilder.cs b/mcs/class/System.Web/System.Web.UI/RootBuilder.cs
index 713235a40bf45bd18a18e775f369a20ec8570c52..8bf44dc77a138d38f6521834b0ace658099abb4f 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/RootBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI/RootBuilder.cs
@@ -42,8 +42,8 @@ namespace System.Web.UI
 
                static RootBuilder ()
                {
-                       htmlControls = new Hashtable (new CaseInsensitiveHashCodeProvider (),
-                                                     new CaseInsensitiveComparer ()); 
+                       htmlControls = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
+                                                     CaseInsensitiveComparer.DefaultInvariant); 
 
                        htmlControls.Add ("A", typeof (HtmlAnchor));
                        htmlControls.Add ("BUTTON", typeof (HtmlButton));
@@ -60,8 +60,8 @@ namespace System.Web.UI
                        htmlControls.Add ("HEAD", typeof (HtmlHead));
 #endif
 
-                       htmlInputControls = new Hashtable (new CaseInsensitiveHashCodeProvider (),
-                                                          new CaseInsensitiveComparer ());
+                       htmlInputControls = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
+                                                     CaseInsensitiveComparer.DefaultInvariant); 
 
                        htmlInputControls.Add ("BUTTON", typeof (HtmlInputButton));
                        htmlInputControls.Add ("SUBMIT", typeof (HtmlInputButton));

diff --git a/mcs/class/System.Web/System.Web/MimeTypes.cs b/mcs/class/System.Web/System.Web/MimeTypes.cs
index c0aa32aaf1b3c5c6dfe9cbed7b72749b7eea4298..4a1e1a56eb94c427ec14cfbcfaf983b8f057ad22 100644 (file)
--- a/mcs/class/System.Web/System.Web/MimeTypes.cs
+++ b/mcs/class/System.Web/System.Web/MimeTypes.cs
@@ -39,8 +39,8 @@ namespace System.Web
 
                static MimeTypes ()
                {
-                       mimeTypes = new Hashtable (CaseInsensitiveHashCodeProvider.Default,
-                                                  CaseInsensitiveComparer.Default);
+                       mimeTypes = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
+                                                  CaseInsensitiveComparer.DefaultInvariant);
 
                        mimeTypes.Add ("3dm", "x-world/x-3dmf");
                        mimeTypes.Add ("3dmf", "x-world/x-3dmf");

diff --git a/mcs/class/System.Web/System.Web/SiteMapProvider.cs b/mcs/class/System.Web/System.Web/SiteMapProvider.cs
index 42e37a8caa96dbb5f4b632a0bb94f0f9786578c6..f65a07687c09fb8d1f1e740e8753ba0476e36e68 100644 (file)
--- a/mcs/class/System.Web/System.Web/SiteMapProvider.cs
+++ b/mcs/class/System.Web/System.Web/SiteMapProvider.cs
@@ -110,8 +110,8 @@ namespace System.Web {
                                        lock (this) {
                                                if (urlToNode == null) {
                                                        urlToNode = new Hashtable (
-                                                               new CaseInsensitiveHashCodeProvider (),
-                                                               new CaseInsensitiveComparer ()
+                                                               CaseInsensitiveHashCodeProvider.DefaultInvariant,
+                                                               CaseInsensitiveComparer.DefaultInvariant
                                                        );
                                                }
                                        }