Imported Upstream version 4.6.0.182

Former-commit-id: 439c182e520038bf50777ca2fe684f216ae28552
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-09-01 10:46:18 +00:00
parent c911219690
commit 804b15604f
118 changed files with 1007 additions and 891 deletions

View File

@ -72,9 +72,9 @@ namespace System.ServiceModel.Channels
l.Add (header);
}
public void CopyHeaderFrom (Message m, int index)
public void CopyHeaderFrom (Message message, int headerIndex)
{
CopyHeaderFrom (m.Headers, index);
CopyHeaderFrom (message.Headers, headerIndex);
}
public void Clear ()
@ -82,25 +82,25 @@ namespace System.ServiceModel.Channels
l.Clear ();
}
public void CopyHeaderFrom (MessageHeaders headers, int index)
public void CopyHeaderFrom (MessageHeaders collection, int headerIndex)
{
l.Add (headers [index]);
l.Add (collection [headerIndex]);
}
public void CopyHeadersFrom (Message m)
public void CopyHeadersFrom (Message message)
{
CopyHeadersFrom (m.Headers);
CopyHeadersFrom (message.Headers);
}
public void CopyHeadersFrom (MessageHeaders headers)
public void CopyHeadersFrom (MessageHeaders collection)
{
foreach (MessageHeaderInfo h in headers)
foreach (MessageHeaderInfo h in collection)
l.Add (h);
}
public void CopyTo (MessageHeaderInfo [] dst, int index)
public void CopyTo (MessageHeaderInfo [] array, int index)
{
l.CopyTo (dst, index);
l.CopyTo (array, index);
}
public int FindHeader (string name, string ns)
@ -203,11 +203,11 @@ namespace System.ServiceModel.Channels
return GetHeader<T> (idx, serializer);
}
public XmlDictionaryReader GetReaderAtHeader (int index)
public XmlDictionaryReader GetReaderAtHeader (int headerIndex)
{
if (index >= l.Count)
throw new ArgumentOutOfRangeException (String.Format ("Index is out of range. Current header count is {0}", index));
MessageHeader item = (MessageHeader) l [index];
if (headerIndex >= l.Count)
throw new ArgumentOutOfRangeException (String.Format ("Index is out of range. Current header count is {0}", l.Count));
MessageHeader item = (MessageHeader) l [headerIndex];
XmlReader reader =
item is MessageHeader.XmlMessageHeader ?
@ -231,9 +231,9 @@ namespace System.ServiceModel.Channels
throw new NotImplementedException ();
}
public void Insert (int index, MessageHeader header)
public void Insert (int headerIndex, MessageHeader header)
{
l.Insert (index, header);
l.Insert (headerIndex, header);
}
public void RemoveAll (string name, string ns)
@ -251,9 +251,9 @@ namespace System.ServiceModel.Channels
l.RemoveAt (l.Count - 1);
}
public void RemoveAt (int index)
public void RemoveAt (int headerIndex)
{
l.RemoveAt (index);
l.RemoveAt (headerIndex);
}
IEnumerator IEnumerable.GetEnumerator ()
@ -261,48 +261,48 @@ namespace System.ServiceModel.Channels
return ((IEnumerable) l).GetEnumerator ();
}
public void WriteHeader (int index, XmlDictionaryWriter writer)
public void WriteHeader (int headerIndex, XmlDictionaryWriter writer)
{
if (version.Envelope == EnvelopeVersion.None)
return;
WriteStartHeader (index, writer);
WriteHeaderContents (index, writer);
WriteStartHeader (headerIndex, writer);
WriteHeaderContents (headerIndex, writer);
writer.WriteEndElement ();
}
public void WriteHeader (int index, XmlWriter writer)
public void WriteHeader (int headerIndex, XmlWriter writer)
{
WriteHeader (index, XmlDictionaryWriter.CreateDictionaryWriter (writer));
WriteHeader (headerIndex, XmlDictionaryWriter.CreateDictionaryWriter (writer));
}
public void WriteHeaderContents (int index, XmlDictionaryWriter writer)
public void WriteHeaderContents (int headerIndex, XmlDictionaryWriter writer)
{
if (index > l.Count)
throw new ArgumentOutOfRangeException ("There is no header at position " + index + ".");
if (headerIndex > l.Count)
throw new ArgumentOutOfRangeException ("There is no header at position " + headerIndex + ".");
MessageHeader h = l [index] as MessageHeader;
MessageHeader h = l [headerIndex] as MessageHeader;
h.WriteHeaderContents (writer, version);
}
public void WriteHeaderContents (int index, XmlWriter writer)
public void WriteHeaderContents (int headerIndex, XmlWriter writer)
{
WriteHeaderContents (index, XmlDictionaryWriter.CreateDictionaryWriter (writer));
WriteHeaderContents (headerIndex, XmlDictionaryWriter.CreateDictionaryWriter (writer));
}
public void WriteStartHeader (int index, XmlDictionaryWriter writer)
public void WriteStartHeader (int headerIndex, XmlDictionaryWriter writer)
{
if (index > l.Count)
throw new ArgumentOutOfRangeException ("There is no header at position " + index + ".");
if (headerIndex > l.Count)
throw new ArgumentOutOfRangeException ("There is no header at position " + headerIndex + ".");
MessageHeader h = l [index] as MessageHeader;
MessageHeader h = l [headerIndex] as MessageHeader;
h.WriteStartHeader (writer, version);
}
public void WriteStartHeader (int index, XmlWriter writer)
public void WriteStartHeader (int headerIndex, XmlWriter writer)
{
WriteStartHeader (index, XmlDictionaryWriter.CreateDictionaryWriter (writer));
WriteStartHeader (headerIndex, XmlDictionaryWriter.CreateDictionaryWriter (writer));
}
public string Action {