Author: adar
Date: 2007-05-14 09:33:16 -0400 (Mon, 14 May 2007)
New Revision: 77344
Modified:
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaExporter.cs
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSchemas.cs
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
Log:
merge -r 77339:77340
Modified:
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
2007-05-14 13:03:00 UTC (rev 77343)
+++
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
2007-05-14 13:33:16 UTC (rev 77344)
@@ -1,3 +1,16 @@
+2007-05-14 Adar Wesley <[EMAIL PROTECTED]>
+
+ * XmlSchemaExporter.cs: added missing overload for method ExportAnyType.
+
+ * XmlSchemas.cs: added missing methods Add, AddReference, Contains,
+ GetSchemas.
+
+ * XmlSerializationReader.cs: added missing method AddReaderCount.
+
+ * XmlSerializationWriter.cs: added missing overload WriteStartElement.
+
+ * XmlSerializer.cs: added missing overload Serialize.
+
2007-04-25 Atsushi Enomoto <[EMAIL PROTECTED]>
* XmlSchemas.cs : 1.1-only duplicate check does not seem to be
Modified:
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaExporter.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaExporter.cs
2007-05-14 13:03:00 UTC (rev 77343)
+++
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaExporter.cs
2007-05-14 13:33:16 UTC (rev 77344)
@@ -69,6 +69,14 @@
throw new NotImplementedException ();
}
+#if NET_2_0
+ [MonoNotSupported("")]
+ public string ExportAnyType (XmlMembersMapping members)
+ {
+ throw new NotImplementedException ();
+ }
+#endif
+
public void ExportMembersMapping (XmlMembersMapping
xmlMembersMapping)
{
ExportMembersMapping (xmlMembersMapping, true);
Modified:
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSchemas.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSchemas.cs
2007-05-14 13:03:00 UTC (rev 77343)
+++
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSchemas.cs
2007-05-14 13:33:16 UTC (rev 77344)
@@ -107,11 +107,33 @@
Add (schema);
}
+#if NET_2_0
+ [MonoNotSupported("")]
+ public int Add (XmlSchema schema, Uri baseUri)
+ {
+ throw new NotImplementedException ();
+ }
+
+ [MonoNotSupported("")]
+ public void AddReference (XmlSchema schema)
+ {
+ throw new NotImplementedException ();
+ }
+#endif
+
public bool Contains (XmlSchema schema)
{
return List.Contains (schema);
}
+#if NET_2_0
+ [MonoNotSupported("")]
+ public bool Contains (string targetNamespace)
+ {
+ throw new NotImplementedException ();
+ }
+#endif
+
public void CopyTo (XmlSchema[] array, int index)
{
List.CopyTo (array, index);
@@ -177,6 +199,14 @@
else return res;
}
+#if NET_2_0
+ [MonoNotSupported("")]
+ public IList GetSchemas (string ns)
+ {
+ throw new NotImplementedException ();
+ }
+#endif
+
public int IndexOf (XmlSchema schema)
{
return List.IndexOf (schema);
Modified:
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs
2007-05-14 13:03:00 UTC (rev 77343)
+++
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs
2007-05-14 13:33:16 UTC (rev 77344)
@@ -269,6 +269,14 @@
return new InvalidOperationException (message);
}
+#if NET_2_0
+ [MonoNotSupported("")]
+ protected void CheckReaderCount (ref int whileIterations, ref
int readerCount)
+ {
+ throw new NotImplementedException ();
+ }
+#endif
+
protected Array EnsureArrayIndex (Array a, int index, Type
elementType)
{
if (a != null && index < a.Length)
Modified:
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs
2007-05-14 13:03:00 UTC (rev 77343)
+++
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs
2007-05-14 13:33:16 UTC (rev 77344)
@@ -836,6 +836,14 @@
}
}
+#if NET_2_0
+ [MonoNotSupported("")]
+ protected void WriteStartElement (string name, string ns,
Object o, bool writePrefixed, XmlSerializerNamespaces xmlns)
+ {
+ throw new NotImplementedException ();
+ }
+#endif
+
protected void WriteTypedPrimitive (string name, string ns,
object o, bool xsiType)
{
string value;
Modified:
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
2007-05-14 13:03:00 UTC (rev 77343)
+++
branches/mainsoft/gh20/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
2007-05-14 13:33:16 UTC (rev 77344)
@@ -549,6 +549,11 @@
throw new NotImplementedException ();
}
+ [MonoNotSupported("")]
+ public void Serialize (XmlWriter xmlWriter, Object o,
XmlSerializerNamespaces namespaces, string encodingStyle, string id)
+ {
+ throw new NotImplementedException ();
+ }
#endif
XmlSerializationWriter CreateWriter (XmlMapping typeMapping)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
