Author: mhabersack
Date: 2007-09-14 08:58:12 -0400 (Fri, 14 Sep 2007)
New Revision: 85800
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/AppResourcesCompiler.cs
trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
Log:
2007-09-14 Marek Habersack <[EMAIL PROTECTED]>
* AppResourcesCompiler.cs: use _culture and _resourceManager
instead of culture and resourceManger in the generated code, to
avoid case problems for languages that are case-insensitive.
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/AppResourcesCompiler.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/AppResourcesCompiler.cs
2007-09-14 12:53:29 UTC (rev 85799)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/AppResourcesCompiler.cs
2007-09-14 12:58:12 UTC (rev 85800)
@@ -414,12 +414,12 @@
cls.IsClass = true;
cls.TypeAttributes = TypeAttributes.Public |
TypeAttributes.Sealed;
- CodeMemberField cmf = new CodeMemberField
(typeof(CultureInfo), "culture");
+ CodeMemberField cmf = new CodeMemberField
(typeof(CultureInfo), "_culture");
cmf.InitExpression = new CodePrimitiveExpression (null);
cmf.Attributes = MemberAttributes.Private |
MemberAttributes.Final | MemberAttributes.Static;
cls.Members.Add (cmf);
- cmf = new CodeMemberField (typeof(ResourceManager),
"resourceManager");
+ cmf = new CodeMemberField (typeof(ResourceManager),
"_resourceManager");
cmf.InitExpression = new CodePrimitiveExpression (null);
cmf.Attributes = MemberAttributes.Private |
MemberAttributes.Final | MemberAttributes.Static;
cls.Members.Add (cmf);
@@ -441,8 +441,8 @@
cmp.HasGet = true;
cmp.HasSet = true;
cmp.Type = new CodeTypeReference (typeof(CultureInfo));
- CodePropertyGenericGet (cmp.GetStatements, "culture",
classname);
- CodePropertyGenericSet (cmp.SetStatements, "culture",
classname);
+ CodePropertyGenericGet (cmp.GetStatements, "_culture",
classname);
+ CodePropertyGenericSet (cmp.SetStatements, "_culture",
classname);
cls.Members.Add (cmp);
// Add the resource properties
@@ -498,7 +498,7 @@
CodeStatement st;
CodeExpression exp;
- exp = new CodeFieldReferenceExpression (new
CodeTypeReferenceExpression (typename), "resourceManager");
+ exp = new CodeFieldReferenceExpression (new
CodeTypeReferenceExpression (typename), "_resourceManager");
st = new CodeConditionStatement (
new CodeBinaryOperatorExpression (
exp,
@@ -535,7 +535,7 @@
gotstr ? "GetString" : "GetObject",
new CodeExpression [] { new
CodePrimitiveExpression (resname),
new
CodeFieldReferenceExpression (
- new
CodeTypeReferenceExpression (typename), "culture") });
+ new
CodeTypeReferenceExpression (typename), "_culture") });
st = new CodeVariableDeclarationStatement (
restype,
"obj",
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2007-09-14
12:53:29 UTC (rev 85799)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2007-09-14
12:58:12 UTC (rev 85800)
@@ -1,3 +1,9 @@
+2007-09-14 Marek Habersack <[EMAIL PROTECTED]>
+
+ * AppResourcesCompiler.cs: use _culture and _resourceManager
+ instead of culture and resourceManger in the generated code, to
+ avoid case problems for languages that are case-insensitive.
+
2007-09-10 Marek Habersack <[EMAIL PROTECTED]>
* TemplateControlCompiler.cs: cast the expression to the field
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
