Author: gonzalo
Date: 2005-04-27 03:39:34 -0400 (Wed, 27 Apr 2005)
New Revision: 43643
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/AspComponentFoundry.cs
trunk/mcs/class/System.Web/System.Web.Compilation/Directive.cs
trunk/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs
trunk/mcs/class/System.Web/System.Web.Configuration/BuildProviderCollection.cs
trunk/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectoriesCollection.cs
trunk/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
trunk/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilderCollection.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/FontUnit.cs
trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
trunk/mcs/class/System.Web/System.Web.UI/RootBuilder.cs
trunk/mcs/class/System.Web/System.Web/MimeTypes.cs
trunk/mcs/class/System.Web/System.Web/SiteMapProvider.cs
Log:
Use CultureInfo.DefaultInvariant instead of just the Default
Modified: trunk/mcs/class/System.Web/System.Web/MimeTypes.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web/MimeTypes.cs 2005-04-27 07:34:51 UTC
(rev 43642)
+++ trunk/mcs/class/System.Web/System.Web/MimeTypes.cs 2005-04-27 07:39:34 UTC
(rev 43643)
@@ -39,8 +39,8 @@
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");
Modified: trunk/mcs/class/System.Web/System.Web/SiteMapProvider.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web/SiteMapProvider.cs 2005-04-27
07:34:51 UTC (rev 43642)
+++ trunk/mcs/class/System.Web/System.Web/SiteMapProvider.cs 2005-04-27
07:39:34 UTC (rev 43643)
@@ -110,8 +110,8 @@
lock (this) {
if (urlToNode == null) {
urlToNode = new
Hashtable (
- new
CaseInsensitiveHashCodeProvider (),
- new
CaseInsensitiveComparer ()
+
CaseInsensitiveHashCodeProvider.DefaultInvariant,
+
CaseInsensitiveComparer.DefaultInvariant
);
}
}
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/AspComponentFoundry.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/AspComponentFoundry.cs
2005-04-27 07:34:51 UTC (rev 43642)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/AspComponentFoundry.cs
2005-04-27 07:39:34 UTC (rev 43643)
@@ -40,8 +40,8 @@
public AspComponentFoundry ()
{
- foundries = new Hashtable
(CaseInsensitiveHashCodeProvider.Default,
-
CaseInsensitiveComparer.Default);
+ foundries = new Hashtable
(CaseInsensitiveHashCodeProvider.DefaultInvariant,
+
CaseInsensitiveComparer.DefaultInvariant);
Assembly sw = typeof (AspComponentFoundry).Assembly;
RegisterFoundry ("asp", sw,
"System.Web.UI.WebControls");
@@ -150,8 +150,8 @@
public CompoundFoundry (string tagPrefix)
{
this.tagPrefix = tagPrefix;
- tagnames = new Hashtable
(CaseInsensitiveHashCodeProvider.Default,
-
CaseInsensitiveComparer.Default);
+ tagnames = new Hashtable
(CaseInsensitiveHashCodeProvider.DefaultInvariant,
+
CaseInsensitiveComparer.DefaultInvariant);
}
public void Add (Foundry foundry)
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/Directive.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/Directive.cs
2005-04-27 07:34:51 UTC (rev 43642)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/Directive.cs
2005-04-27 07:39:34 UTC (rev 43643)
@@ -30,6 +30,7 @@
using System;
using System.Collections;
+using System.Globalization;
namespace System.Web.Compilation
{
@@ -72,8 +73,8 @@
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);
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs
2005-04-27 07:34:51 UTC (rev 43642)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/TagAttributes.cs
2005-04-27 07:39:34 UTC (rev 43643)
@@ -51,8 +51,8 @@
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 @@
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--)
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration/BuildProviderCollection.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.Configuration/BuildProviderCollection.cs
2005-04-27 07:34:51 UTC (rev 43642)
+++
trunk/mcs/class/System.Web/System.Web.Configuration/BuildProviderCollection.cs
2005-04-27 07:39:34 UTC (rev 43643)
@@ -84,7 +84,7 @@
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 ()
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectoriesCollection.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectoriesCollection.cs
2005-04-27 07:34:51 UTC (rev 43642)
+++
trunk/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectoriesCollection.cs
2005-04-27 07:39:34 UTC (rev 43643)
@@ -73,7 +73,7 @@
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 ()
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
2005-04-27 07:34:51 UTC (rev 43642)
+++ trunk/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
2005-04-27 07:39:34 UTC (rev 43643)
@@ -42,8 +42,8 @@
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 @@
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 ()
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilderCollection.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilderCollection.cs
2005-04-27 07:34:51 UTC (rev 43642)
+++
trunk/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilderCollection.cs
2005-04-27 07:39:34 UTC (rev 43643)
@@ -86,7 +86,7 @@
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 ()
Modified: trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs 2005-04-27
07:34:51 UTC (rev 43642)
+++ trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs 2005-04-27
07:39:34 UTC (rev 43643)
@@ -35,8 +35,8 @@
public class HtmlTextWriter : System.IO.TextWriter {
static HtmlTextWriter(){
- HtmlTextWriter._tagKeyLookupTable = new
Hashtable(97,CaseInsensitiveHashCodeProvider.Default,
-
CaseInsensitiveComparer.Default);
+ HtmlTextWriter._tagKeyLookupTable = new
Hashtable(97,CaseInsensitiveHashCodeProvider.DefaultInvariant,
+
CaseInsensitiveComparer.DefaultInvariant);
HtmlTextWriter._tagNameLookupArray = new TagInformation[97];
HtmlTextWriter.RegisterTag("", HtmlTextWriterTag.Unknown,
TagType.Other);
HtmlTextWriter.RegisterTag("a", HtmlTextWriterTag.A, TagType.Inline);
@@ -141,8 +141,8 @@
#else
HtmlTextWriter._attrNameLookupArray = new AttributeInformation[40];
#endif
- HtmlTextWriter._attrKeyLookupTable = new Hashtable
(HtmlTextWriter._attrNameLookupArray.Length,
-
CaseInsensitiveHashCodeProvider.Default, CaseInsensitiveComparer.Default);
+ HtmlTextWriter._attrKeyLookupTable = new Hashtable
(HtmlTextWriter._attrNameLookupArray.Length,
+
CaseInsensitiveHashCodeProvider.DefaultInvariant,
CaseInsensitiveComparer.DefaultInvariant);
HtmlTextWriter.RegisterAttribute("accesskey",
HtmlTextWriterAttribute.Accesskey, true);
HtmlTextWriter.RegisterAttribute("align",
HtmlTextWriterAttribute.Align, false);
HtmlTextWriter.RegisterAttribute("alt", HtmlTextWriterAttribute.Alt,
true);
@@ -205,8 +205,8 @@
#else
HtmlTextWriter._styleNameLookupArray = new String[14];
#endif
- HtmlTextWriter._styleKeyLookupTable = new Hashtable
(HtmlTextWriter._styleNameLookupArray.Length,
-
CaseInsensitiveHashCodeProvider.Default, CaseInsensitiveComparer.Default);
+ HtmlTextWriter._styleKeyLookupTable = new Hashtable
(HtmlTextWriter._styleNameLookupArray.Length,
+
CaseInsensitiveHashCodeProvider.DefaultInvariant,
CaseInsensitiveComparer.DefaultInvariant);
HtmlTextWriter.RegisterStyle("background-color",
HtmlTextWriterStyle.BackgroundColor);
HtmlTextWriter.RegisterStyle("background-image",
HtmlTextWriterStyle.BackgroundImage);
HtmlTextWriter.RegisterStyle("border-collapse",
HtmlTextWriterStyle.BorderCollapse);
Modified: trunk/mcs/class/System.Web/System.Web.UI/RootBuilder.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/RootBuilder.cs 2005-04-27
07:34:51 UTC (rev 43642)
+++ trunk/mcs/class/System.Web/System.Web.UI/RootBuilder.cs 2005-04-27
07:39:34 UTC (rev 43643)
@@ -42,8 +42,8 @@
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 @@
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));
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/FontUnit.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/FontUnit.cs
2005-04-27 07:34:51 UTC (rev 43642)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/FontUnit.cs
2005-04-27 07:39:34 UTC (rev 43643)
@@ -65,8 +65,8 @@
static FontUnit ()
{
- sizeTable = new Hashtable
(CaseInsensitiveHashCodeProvider.Default,
-
CaseInsensitiveComparer.Default);
+ sizeTable = new Hashtable
(CaseInsensitiveHashCodeProvider.DefaultInvariant,
+
CaseInsensitiveComparer.DefaultInvariant);
sizeTable.Add ("smaller", 2);
sizeTable.Add ("larger", 3);
sizeTable.Add ("xx-small", 4);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
