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

Imported Upstream version 4.2.0.179

Browse Source 
Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs
View File

@ -942,8 +942,7 @@ namespace System.Xml.Serialization
line_position = 0;
}
XmlAttributeEventArgs args = new XmlAttributeEventArgs (attr, line_number, line_position, o);
args.ExpectedAttributes = qnames;
XmlAttributeEventArgs args = new XmlAttributeEventArgs (attr, line_number, line_position, o, qnames);
if (eventSource != null)
eventSource.OnUnknownAttribute (args);
@ -967,8 +966,7 @@ namespace System.Xml.Serialization
line_position = 0;
}
XmlElementEventArgs args = new XmlElementEventArgs (elem, line_number, line_position, o);
args.ExpectedElements = qnames;
XmlElementEventArgs args = new XmlElementEventArgs (elem, line_number, line_position, o, qnames);
if (eventSource != null)
eventSource.OnUnknownElement (args);
@ -1010,7 +1008,7 @@ namespace System.Xml.Serialization
else
{
if (eventSource != null)
eventSource.OnUnknownNode (new XmlNodeEventArgs(line_number, line_position, node.LocalName, node.Name, node.NamespaceURI, node.NodeType, o, node.Value));
eventSource.OnUnknownNode (new XmlNodeEventArgs(node, line_number, line_position, o));
if (Reader.ReadState == ReadState.EndOfFile)
throw new InvalidOperationException ("End of document found");
@ -1040,7 +1038,14 @@ namespace System.Xml.Serialization
object collectionItems;
string id;
public CollectionFixup (object collection, XmlSerializationCollectionFixupCallback callback, string id)
public CollectionFixup(object collection, XmlSerializationCollectionFixupCallback callback, object collectionItems)
{
this.callback = callback;
this.collection = collection;
this.collectionItems = collectionItems;
}
internal CollectionFixup (object collection, XmlSerializationCollectionFixupCallback callback, string id)
{
this.callback = callback;
this.collection = collection;
@ -1055,14 +1060,14 @@ namespace System.Xml.Serialization
get { return collection; }
}
public object Id {
internal object Id {
get { return id; }
}
internal object CollectionItems
public object CollectionItems
{
get { return collectionItems; }
set { collectionItems = value; }
internal set { collectionItems = value; }
}
}
@ -1100,7 +1105,7 @@ namespace System.Xml.Serialization
}
}
protected class CollectionItemFixup
class CollectionItemFixup
{
Array list;
int index;