Imported Upstream version 5.2.0.175

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

View File

@ -42,22 +42,22 @@ namespace System.Web.UI
{
}
public static object Eval (object container, string xpath)
public static object Eval (object container, string xPath)
{
return Eval (container, xpath, (IXmlNamespaceResolver)null);
return Eval (container, xPath, (IXmlNamespaceResolver)null);
}
public static object Eval (object container, string xpath, IXmlNamespaceResolver resolver)
public static object Eval (object container, string xPath, IXmlNamespaceResolver resolver)
{
if (xpath == null || xpath.Length == 0)
throw new ArgumentNullException ("xpath");
if (xPath == null || xPath.Length == 0)
throw new ArgumentNullException ("xPath");
IXPathNavigable factory = container as IXPathNavigable;
if (factory == null)
throw new ArgumentException ("container");
object result = factory.CreateNavigator ().Evaluate (xpath, resolver);
object result = factory.CreateNavigator ().Evaluate (xPath, resolver);
XPathNodeIterator itr = result as XPathNodeIterator;
if (itr != null) {
@ -70,14 +70,14 @@ namespace System.Web.UI
return result;
}
public static string Eval (object container, string xpath, string format)
public static string Eval (object container, string xPath, string format)
{
return Eval (container, xpath, format, null);
return Eval (container, xPath, format, null);
}
public static string Eval (object container, string xpath, string format, IXmlNamespaceResolver resolver)
public static string Eval (object container, string xPath, string format, IXmlNamespaceResolver resolver)
{
object result = Eval (container, xpath, resolver);
object result = Eval (container, xPath, resolver);
if (result == null)
return String.Empty;
@ -87,22 +87,22 @@ namespace System.Web.UI
return String.Format (format, result);
}
public static IEnumerable Select (object container, string xpath)
public static IEnumerable Select (object container, string xPath)
{
return Select (container, xpath, null);
return Select (container, xPath, null);
}
public static IEnumerable Select (object container, string xpath, IXmlNamespaceResolver resolver)
public static IEnumerable Select (object container, string xPath, IXmlNamespaceResolver resolver)
{
if (xpath == null || xpath.Length == 0)
throw new ArgumentNullException ("xpath");
if (xPath == null || xPath.Length == 0)
throw new ArgumentNullException ("xPath");
IXPathNavigable factory = container as IXPathNavigable;
if (factory == null)
throw new ArgumentException ("container");
XPathNodeIterator itr = factory.CreateNavigator ().Select (xpath, resolver);
XPathNodeIterator itr = factory.CreateNavigator ().Select (xPath, resolver);
ArrayList ret = new ArrayList ();
while (itr.MoveNext ()) {