Author: mhabersack
Date: 2007-05-15 16:48:57 -0400 (Tue, 15 May 2007)
New Revision: 77437
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
trunk/mcs/class/System.Web/System.Web.Compilation/ResourceExpressionBuilder.cs
trunk/mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
Log:
2007-05-15 Marek Habersack <[EMAIL PROTECTED]>
* ResourceExpressionBuilder.cs: added a static method to generate
a GetLocalResourceObject call which properly handles types which
cannot be converted from strings.
* TemplateControlCompiler.cs: use code described above to generate
code for properties assigned from resources.
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2007-05-15
20:16:00 UTC (rev 77436)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2007-05-15
20:48:57 UTC (rev 77437)
@@ -1,5 +1,12 @@
2007-05-15 Marek Habersack <[EMAIL PROTECTED]>
+ * ResourceExpressionBuilder.cs: added a static method to generate
+ a GetLocalResourceObject call which properly handles types which
+ cannot be converted from strings.
+
+ * TemplateControlCompiler.cs: use code described above to generate
+ code for properties assigned from resources.
+
* WsdlBuildProvider.cs: make the code actually work - get the
physical path of VirtualPath instead of converting it to absolute
URI path.
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/ResourceExpressionBuilder.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.Compilation/ResourceExpressionBuilder.cs
2007-05-15 20:16:00 UTC (rev 77436)
+++
trunk/mcs/class/System.Web/System.Web.Compilation/ResourceExpressionBuilder.cs
2007-05-15 20:48:57 UTC (rev 77437)
@@ -32,6 +32,8 @@
using System;
using System.CodeDom;
+using System.ComponentModel;
+using System.Reflection;
using System.Web;
using System.Web.UI;
@@ -55,20 +57,15 @@
{
ResourceExpressionFields fields = parsedData as
ResourceExpressionFields;
CodeExpression[] expr;
- string methodName;
if (!String.IsNullOrEmpty (fields.ClassKey)) {
expr = new CodeExpression [] {
new CodePrimitiveExpression
(fields.ClassKey),
new CodePrimitiveExpression
(fields.ResourceKey)
};
- methodName = "GetGlobalResourceObject";
- } else {
- expr = new CodeExpression [] { new
CodePrimitiveExpression (fields.ResourceKey) };
- methodName = "GetLocalResourceObject";
- }
-
- return new CodeMethodInvokeExpression (new
CodeThisReferenceExpression (), methodName, expr);
+ return new CodeMethodInvokeExpression (new
CodeThisReferenceExpression (), "GetGlobalResourceObject", expr);
+ } else
+ return CreateGetLocalResourceObject
(entry.PropertyInfo, fields.ResourceKey);
}
public static ResourceExpressionFields ParseExpression (string
expression)
@@ -90,6 +87,48 @@
public override bool SupportsEvaluate {
get { return true; }
}
+
+ internal static CodeExpression CreateGetLocalResourceObject
(MemberInfo mi, string resname)
+ {
+ Type member_type = null;
+ if (mi is PropertyInfo)
+ member_type = ((PropertyInfo)mi).PropertyType;
+ else if (mi is FieldInfo)
+ member_type = ((FieldInfo)mi).FieldType;
+ else
+ return null; // an "impossible" case
+
+ string memberName = mi.Name;
+ Type declaringType = mi.DeclaringType;
+ TypeConverter converter = TypeDescriptor.GetProperties
(declaringType) [memberName].Converter;
+
+ if (member_type != typeof (System.Drawing.Color) &&
+ (converter == null || converter.CanConvertFrom
(typeof (String)))) {
+ CodeMethodInvokeExpression getlro = new
CodeMethodInvokeExpression (
+ new CodeThisReferenceExpression (),
+ "GetLocalResourceObject",
+ new CodeExpression [] { new
CodePrimitiveExpression (resname) });
+
+ CodeMethodInvokeExpression convert = new
CodeMethodInvokeExpression ();
+ convert.Method = new
CodeMethodReferenceExpression (
+ new CodeTypeReferenceExpression (typeof
(System.Convert)),
+ "ToString");
+ convert.Parameters.Add (getlro);
+ return convert;
+ } else {
+ CodeMethodInvokeExpression getlro = new
CodeMethodInvokeExpression (
+ new CodeThisReferenceExpression (),
+ "GetLocalResourceObject",
+ new CodeExpression [] {
+ new CodePrimitiveExpression
(resname),
+ new CodeTypeOfExpression (new
CodeTypeReference (declaringType)),
+ new CodePrimitiveExpression
(memberName)
+ }
+ );
+
+ return new CodeCastExpression (member_type,
getlro);
+ }
+ }
}
}
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
2007-05-15 20:16:00 UTC (rev 77436)
+++
trunk/mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
2007-05-15 20:48:57 UTC (rev 77437)
@@ -690,40 +690,40 @@
throw new HttpException (
String.Format ("Failed to create an
instance of type `{0}'", builderType), e);
}
- // FIXME: create and pass an instance of
BoundPropertyEntry
- CodeMethodInvokeExpression convert = new
CodeMethodInvokeExpression ();
- convert.Method = new CodeMethodReferenceExpression (
- new CodeTypeReferenceExpression
(typeof(Convert)),
- "ToString");
- convert.Parameters.Add (eb.GetCodeExpression (null,
parsedData, ctx));
- convert.Parameters.Add (
- new CodeFieldReferenceExpression (
- new CodeTypeReferenceExpression
("System.Globalization.CultureInfo"),
- "CurrentCulture"));
- assign.Right = convert;
+ BoundPropertyEntry bpe = CreateBoundPropertyEntry
(member as PropertyInfo, prefix, expr);
+ assign.Right = eb.GetCodeExpression (bpe, parsedData,
ctx);
+
method.Statements.Add (assign);
}
+ BoundPropertyEntry CreateBoundPropertyEntry (PropertyInfo pi,
string prefix, string expr)
+ {
+ if (pi == null)
+ return null;
+
+ BoundPropertyEntry ret = new BoundPropertyEntry ();
+ ret.Expression = expr;
+ ret.ExpressionPrefix = prefix;
+ ret.Generated = false;
+ ret.Name = pi.Name;
+ ret.PropertyInfo = pi;
+ ret.Type = pi.PropertyType;
+
+ return ret;
+ }
+
void AssignPropertyFromResources (CodeMemberMethod method,
MemberInfo mi, string attvalue)
{
- string resname = String.Format ("{0}.{1}", attvalue,
mi.Name);
bool isProperty = mi.MemberType == MemberTypes.Property;
bool isField = !isProperty && (mi.MemberType ==
MemberTypes.Field);
if (!isProperty && !isField ||
!IsWritablePropertyOrField (mi))
- return;
-
- Type member_type = null;
- if (isProperty) {
- PropertyInfo pi = mi as PropertyInfo;
- member_type = pi.PropertyType;
- } else if (isField) {
- FieldInfo fi = mi as FieldInfo;
- member_type = fi.FieldType;
- } else // should never happen
- return;
+ return;
+ string memberName = mi.Name;
+ string resname = String.Format ("{0}.{1}", attvalue,
memberName);
+
// __ctrl.Text =
System.Convert.ToString(HttpContext.GetLocalResourceObject("ButtonResource1.Text"));
string inputFile = parser.InputFile;
string physPath =
HttpContext.Current.Request.PhysicalApplicationPath;
@@ -736,21 +736,22 @@
object obj = HttpContext.GetLocalResourceObject
(inputFile, resname);
if (obj == null)
return;
+
+ Type member_type = null;
+ if (isProperty)
+ member_type = ((PropertyInfo)mi).PropertyType;
+ else if (isField)
+ member_type = ((FieldInfo)mi).FieldType;
+ else
+ return; // an "impossible" case
+ Type declaringType = mi.DeclaringType;
+ TypeConverter converter = TypeDescriptor.GetProperties
(declaringType) [memberName].Converter;
CodeAssignStatement assign = new CodeAssignStatement ();
- assign.Left = new CodePropertyReferenceExpression
(ctrlVar, mi.Name);
- CodeMethodInvokeExpression getlro = new
CodeMethodInvokeExpression (
- thisRef,
- "GetLocalResourceObject",
- new CodeExpression [] { new
CodePrimitiveExpression (resname) });
- CodeMethodInvokeExpression convert = new
CodeMethodInvokeExpression ();
- convert.Method = new CodeMethodReferenceExpression (
- new CodeTypeReferenceExpression
(typeof(System.Convert)),
- "ToString");
- convert.Parameters.Add (getlro);
- assign.Right = convert;
-
+ assign.Left = new CodePropertyReferenceExpression
(ctrlVar, memberName);
+ assign.Right =
ResourceExpressionBuilder.CreateGetLocalResourceObject (mi, resname);
+
method.Statements.Add (assign);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches