mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.2.0.175

Browse Source 
Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mcs/class/System.Web/System.Web.UI/TemplateControl.cs
View File

@ -226,22 +226,22 @@ namespace System.Web.UI
return LoadControl (type, null);
}
public Control LoadControl (Type type, object[] parameters)
public Control LoadControl (Type t, object[] parameters)
{
object [] attrs = null;
if (type != null)
type.GetCustomAttributes (typeof (PartialCachingAttribute), true);
if (t != null)
t.GetCustomAttributes (typeof (PartialCachingAttribute), true);
if (attrs != null && attrs.Length == 1) {
PartialCachingAttribute attr = (PartialCachingAttribute) attrs [0];
PartialCachingControl ctrl = new PartialCachingControl (type, parameters);
PartialCachingControl ctrl = new PartialCachingControl (t, parameters);
ctrl.VaryByParams = attr.VaryByParams;
ctrl.VaryByControls = attr.VaryByControls;
ctrl.VaryByCustom = attr.VaryByCustom;
return ctrl;
}
object control = Activator.CreateInstance (type, parameters);
object control = Activator.CreateInstance (t, parameters);
if (control is UserControl)
((UserControl) control).InitializeAsUserControl (Page);
@ -495,34 +495,34 @@ namespace System.Web.UI
return DataBinder.Eval (Page.GetDataItem(), expression, format);
}
protected internal object XPath (string xpathexpression)
protected internal object XPath (string xPathExpression)
{
return XPathBinder.Eval (Page.GetDataItem(), xpathexpression);
return XPathBinder.Eval (Page.GetDataItem(), xPathExpression);
}
protected internal object XPath (string xpathexpression, IXmlNamespaceResolver resolver)
protected internal object XPath (string xPathExpression, IXmlNamespaceResolver resolver)
{
return XPathBinder.Eval (Page.GetDataItem (), xpathexpression, null, resolver);
return XPathBinder.Eval (Page.GetDataItem (), xPathExpression, null, resolver);
}
protected internal string XPath (string xpathexpression, string format)
protected internal string XPath (string xPathExpression, string format)
{
return XPathBinder.Eval (Page.GetDataItem(), xpathexpression, format);
return XPathBinder.Eval (Page.GetDataItem(), xPathExpression, format);
}
protected internal string XPath (string xpathexpression, string format, IXmlNamespaceResolver resolver)
protected internal string XPath (string xPathExpression, string format, IXmlNamespaceResolver resolver)
{
return XPathBinder.Eval (Page.GetDataItem (), xpathexpression, format, resolver);
return XPathBinder.Eval (Page.GetDataItem (), xPathExpression, format, resolver);
}
protected internal IEnumerable XPathSelect (string xpathexpression)
protected internal IEnumerable XPathSelect (string xPathExpression)
{
return XPathBinder.Select (Page.GetDataItem(), xpathexpression);
return XPathBinder.Select (Page.GetDataItem(), xPathExpression);
}
protected internal IEnumerable XPathSelect (string xpathexpression, IXmlNamespaceResolver resolver)
protected internal IEnumerable XPathSelect (string xPathExpression, IXmlNamespaceResolver resolver)
{
return XPathBinder.Select (Page.GetDataItem (), xpathexpression, resolver);
return XPathBinder.Select (Page.GetDataItem (), xPathExpression, resolver);
}
// IFilterResolutionService