Author: atsushi
Date: 2006-11-01 14:45:33 -0500 (Wed, 01 Nov 2006)
New Revision: 67228
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/CodeGenerationOptions.cs
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/SchemaImporter.cs
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/UnreferencedObjectEventHandler.cs
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttribute.cs
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlArrayAttribute.cs
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeEventHandler.cs
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlElementEventHandler.cs
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlMappingAccess.cs
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlNodeEventHandler.cs
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationCollectionFixupCallback.cs
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationFixupCallback.cs
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReadCallback.cs
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriteCallback.cs
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializerNamespaces.cs
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializerVersionAttribute.cs
Log:
2006-11-01 Atsushi Enomoto <[EMAIL PROTECTED]>
* CodeGenerationOptions.cs : [XmlEnum], [XmlIgnore] and
[Serializable].
* XmlSerializationCollectionFixupCallback.cs,
XmlNodeEventHandler.cs,
XmlSerializationReadCallback.cs,
UnreferencedObjectEventHandler.cs,
XmlSerializationWriteCallback.cs,
XmlAttributeEventHandler.cs,
XmlElementEventHandler.cs,
XmlSerializationFixupCallback.cs :
exclude [Serializable] in NET_2_0.
* XmlSerializerNamespaces.cs : removed beta-only AddInternal().
* XmlSerializerVersionAttribute.cs : removed [Obsolete].
* XmlMappingAccess.cs : it is [Flags].
* SchemaImporter.cs : implement Extensions.
* XmlAnyElementAttribute.cs,
XmlArrayAttribute.cs : added Order.
Note that it is not considered in XmlSerializer yet.
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/CodeGenerationOptions.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/CodeGenerationOptions.cs
2006-11-01 18:51:06 UTC (rev 67227)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/CodeGenerationOptions.cs
2006-11-01 19:45:33 UTC (rev 67228)
@@ -33,18 +33,26 @@
namespace System.Xml.Serialization
{
[Flags]
- [Serializable]
#if NET_2_0
public
#else
+ [Serializable]
internal
#endif
enum CodeGenerationOptions
{
+ [XmlIgnore]
None = 0,
- [Obsolete] UseSqlTypes = 1,
- GenerateProperties = 2,
- GenerateNewAsync = 4,
- GenerateOldAsync = 8
+ [XmlEnum ("properties")]
+ GenerateProperties = 1,
+ [XmlEnum ("newAsync")]
+ GenerateNewAsync = 2,
+ [XmlEnum ("oldAsync")]
+ GenerateOldAsync = 4,
+ [XmlEnum ("order")]
+ GenerateOrder = 8,
+ [XmlEnum ("enableDataBinding")]
+ EnableDataBinding = 16,
+
}
}
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/SchemaImporter.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/SchemaImporter.cs
2006-11-01 18:51:06 UTC (rev 67227)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/SchemaImporter.cs
2006-11-01 19:45:33 UTC (rev 67228)
@@ -39,14 +39,19 @@
{
public abstract class SchemaImporter
{
+ SchemaImporterExtensionCollection extensions;
+
internal SchemaImporter ()
{
}
- [MonoTODO]
public SchemaImporterExtensionCollection Extensions
{
- get { throw new NotImplementedException (); }
+ get {
+ if (extensions == null)
+ extensions = new
SchemaImporterExtensionCollection ();
+ return extensions;
+ }
}
}
}
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/UnreferencedObjectEventHandler.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/UnreferencedObjectEventHandler.cs
2006-11-01 18:51:06 UTC (rev 67227)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/UnreferencedObjectEventHandler.cs
2006-11-01 19:45:33 UTC (rev 67228)
@@ -30,8 +30,10 @@
using System;
namespace System.Xml.Serialization {
-
+
+#if !NET_2_0
[Serializable]
+#endif
public delegate void UnreferencedObjectEventHandler (object sender,
UnreferencedObjectEventArgs e);
}
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttribute.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttribute.cs
2006-11-01 18:51:06 UTC (rev 67227)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttribute.cs
2006-11-01 19:45:33 UTC (rev 67228)
@@ -42,6 +42,7 @@
{
private string elementName;
private string ns;
+ private int order = -1;
public XmlAnyElementAttribute ()
{
@@ -72,6 +73,14 @@
get { return ns; }
set { ns = value; }
}
+
+#if NET_2_0
+ [MonoTODO]
+ public int Order {
+ get { return order; }
+ set { order = value; }
+ }
+#endif
internal void AddKeyHash (System.Text.StringBuilder sb)
{
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlArrayAttribute.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlArrayAttribute.cs
2006-11-01 18:51:06 UTC (rev 67227)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlArrayAttribute.cs
2006-11-01 19:45:33 UTC (rev 67228)
@@ -44,6 +44,7 @@
private XmlSchemaForm form;
private bool isNullable;
private string ns;
+ private int order = -1;
public XmlArrayAttribute()
{
@@ -96,6 +97,14 @@
ns = value;
}
}
+
+#if NET_2_0
+ [MonoTODO]
+ public int Order {
+ get { return order; }
+ set { order = value; }
+ }
+#endif
internal void AddKeyHash (System.Text.StringBuilder sb)
{
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeEventHandler.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeEventHandler.cs
2006-11-01 18:51:06 UTC (rev 67227)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeEventHandler.cs
2006-11-01 19:45:33 UTC (rev 67228)
@@ -31,7 +31,9 @@
namespace System.Xml.Serialization {
+#if !NET_2_0
[Serializable]
+#endif
public delegate void XmlAttributeEventHandler (object sender,
XmlAttributeEventArgs e);
}
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlElementEventHandler.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlElementEventHandler.cs
2006-11-01 18:51:06 UTC (rev 67227)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlElementEventHandler.cs
2006-11-01 19:45:33 UTC (rev 67228)
@@ -31,7 +31,9 @@
namespace System.Xml.Serialization {
+#if !NET_2_0
[Serializable]
+#endif
public delegate void XmlElementEventHandler (object sender,
XmlElementEventArgs e);
}
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlMappingAccess.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlMappingAccess.cs
2006-11-01 18:51:06 UTC (rev 67227)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlMappingAccess.cs
2006-11-01 19:45:33 UTC (rev 67228)
@@ -35,6 +35,7 @@
namespace System.Xml.Serialization
{
+ [Flags]
public enum XmlMappingAccess
{
None,
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlNodeEventHandler.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlNodeEventHandler.cs
2006-11-01 18:51:06 UTC (rev 67227)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlNodeEventHandler.cs
2006-11-01 19:45:33 UTC (rev 67228)
@@ -31,7 +31,9 @@
namespace System.Xml.Serialization {
+#if !NET_2_0
[Serializable]
+#endif
public delegate void XmlNodeEventHandler (object sender,
XmlNodeEventArgs e);
}
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationCollectionFixupCallback.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationCollectionFixupCallback.cs
2006-11-01 18:51:06 UTC (rev 67227)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationCollectionFixupCallback.cs
2006-11-01 19:45:33 UTC (rev 67228)
@@ -32,7 +32,9 @@
namespace System.Xml.Serialization {
+#if !NET_2_0
[Serializable]
+#endif
public delegate void XmlSerializationCollectionFixupCallback (object
collection, object collectionItems);
}
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationFixupCallback.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationFixupCallback.cs
2006-11-01 18:51:06 UTC (rev 67227)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationFixupCallback.cs
2006-11-01 19:45:33 UTC (rev 67228)
@@ -32,7 +32,9 @@
namespace System.Xml.Serialization {
+#if !NET_2_0
[Serializable]
+#endif
public delegate void XmlSerializationFixupCallback (object fixup);
}
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReadCallback.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReadCallback.cs
2006-11-01 18:51:06 UTC (rev 67227)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReadCallback.cs
2006-11-01 19:45:33 UTC (rev 67228)
@@ -32,7 +32,9 @@
namespace System.Xml.Serialization {
+#if !NET_2_0
[Serializable]
+#endif
public delegate object XmlSerializationReadCallback ();
}
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriteCallback.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriteCallback.cs
2006-11-01 18:51:06 UTC (rev 67227)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriteCallback.cs
2006-11-01 19:45:33 UTC (rev 67228)
@@ -32,7 +32,9 @@
namespace System.Xml.Serialization {
+#if !NET_2_0
[Serializable]
+#endif
public delegate void XmlSerializationWriteCallback (object o);
}
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializerNamespaces.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializerNamespaces.cs
2006-11-01 18:51:06 UTC (rev 67227)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializerNamespaces.cs
2006-11-01 19:45:33 UTC (rev 67228)
@@ -66,14 +66,6 @@
namespaces[qname.Name] = qname;
}
-#if NET_2_0
- [MonoTODO]
- public void AddInternal (string prefix, string ns)
- {
- throw new NotImplementedException ();
- }
-#endif
-
public XmlQualifiedName[] ToArray ()
{
XmlQualifiedName[] array = new
XmlQualifiedName[namespaces.Count];
Modified:
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializerVersionAttribute.cs
===================================================================
---
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializerVersionAttribute.cs
2006-11-01 18:51:06 UTC (rev 67227)
+++
branches/atsushi/mcs/class/System.XML/System.Xml.Serialization/XmlSerializerVersionAttribute.cs
2006-11-01 19:45:33 UTC (rev 67228)
@@ -69,7 +69,6 @@
set { _type = value; }
}
- [Obsolete]
public string Version
{
get { return _version; }
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches