Author: atsushi
Date: 2005-06-27 04:33:39 -0400 (Mon, 27 Jun 2005)
New Revision: 46537
Modified:
trunk/mcs/class/System.XML/System.Xml/ChangeLog
trunk/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs
trunk/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
trunk/mcs/class/System.XML/System.Xml/XmlWriter.cs
Log:
2005-06-27 Atsushi Enomoto <[EMAIL PROTECTED]>
* XmlWriter.cs : added Create(XmlWriter).
* XmlValidatingReader.cs : added Read*AsBase64/BinHex().
* XmlReaderSettings.cs : added obsolete annoyances to hush corcompare.
Modified: trunk/mcs/class/System.XML/System.Xml/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/ChangeLog 2005-06-27 08:31:32 UTC
(rev 46536)
+++ trunk/mcs/class/System.XML/System.Xml/ChangeLog 2005-06-27 08:33:39 UTC
(rev 46537)
@@ -1,3 +1,9 @@
+2005-06-27 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * XmlWriter.cs : added Create(XmlWriter).
+ * XmlValidatingReader.cs : added Read*AsBase64/BinHex().
+ * XmlReaderSettings.cs : added obsolete annoyances to hush corcompare.
+
2005-06-22 Atsushi Enomoto <[EMAIL PROTECTED]>
* XmlTextReader.cs : use StringBuilder.ToString(int,int) when it does
Modified: trunk/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs 2005-06-27
08:31:32 UTC (rev 46536)
+++ trunk/mcs/class/System.XML/System.Xml/XmlReaderSettings.cs 2005-06-27
08:33:39 UTC (rev 46537)
@@ -127,6 +127,50 @@
set { ignoreComments = value; }
}
+ [Obsolete ("Use ValidationFlags")]
+ public bool IgnoreIdentityConstraints {
+ get { return (ValidationFlags &
XsValidationFlags.IgnoreIdentityConstraints) != 0; }
+ set {
+ if (value)
+ ValidationFlags |=
XsValidationFlags.IgnoreIdentityConstraints;
+ else
+ ValidationFlags &=
~XsValidationFlags.IgnoreIdentityConstraints;
+ }
+ }
+
+ [Obsolete ("Use ValidationFlags")]
+ public bool IgnoreInlineSchema {
+ get { return (ValidationFlags &
XsValidationFlags.IgnoreInlineSchema) != 0; }
+ set {
+ if (value)
+ ValidationFlags |=
XsValidationFlags.IgnoreInlineSchema;
+ else
+ ValidationFlags &=
~XsValidationFlags.IgnoreInlineSchema;
+ }
+ }
+
+ [Obsolete ("Use ValidationFlags")]
+ public bool IgnoreSchemaLocation {
+ get { return (ValidationFlags &
XsValidationFlags.IgnoreSchemaLocation) != 0; }
+ set {
+ if (value)
+ ValidationFlags |=
XsValidationFlags.IgnoreSchemaLocation;
+ else
+ ValidationFlags &=
~XsValidationFlags.IgnoreSchemaLocation;
+ }
+ }
+
+ [Obsolete ("Use ValidationFlags")]
+ public bool IgnoreValidationWarnings {
+ get { return (ValidationFlags &
XsValidationFlags.IgnoreValidationWarnings) != 0; }
+ set {
+ if (value)
+ ValidationFlags |=
XsValidationFlags.IgnoreValidationWarnings;
+ else
+ ValidationFlags &=
~XsValidationFlags.IgnoreValidationWarnings;
+ }
+ }
+
public bool IgnoreProcessingInstructions {
get { return ignoreProcessingInstructions; }
set { ignoreProcessingInstructions = value; }
@@ -183,7 +227,6 @@
set { validationType = value; }
}
- [CLSCompliant(false)]
public XmlResolver XmlResolver {
internal get { return xmlResolver; }
set { xmlResolver = value; }
Modified: trunk/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
2005-06-27 08:31:32 UTC (rev 46536)
+++ trunk/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
2005-06-27 08:33:39 UTC (rev 46537)
@@ -589,6 +589,44 @@
else if (ValidationType != ValidationType.None &&
e.Severity == XmlSeverityType.Error)
throw e.Exception;
}
+
+#if NET_2_0
+ [MonoTODO ("Check how expanded entity is handled here.")]
+ public override int ReadContentAsBase64 (byte [] buffer, int
offset, int length)
+ {
+ if (validatingReader != null)
+ return validatingReader.ReadContentAsBase64
(buffer, offset, length);
+ else
+ return sourceReader.ReadContentAsBase64
(buffer, offset, length);
+ }
+
+ [MonoTODO ("Check how expanded entity is handled here.")]
+ public override int ReadContentAsBinHex (byte [] buffer, int
offset, int length)
+ {
+ if (validatingReader != null)
+ return validatingReader.ReadContentAsBinHex
(buffer, offset, length);
+ else
+ return sourceReader.ReadContentAsBinHex
(buffer, offset, length);
+ }
+
+ [MonoTODO ("Check how expanded entity is handled here.")]
+ public override int ReadElementContentAsBase64 (byte [] buffer,
int offset, int length)
+ {
+ if (validatingReader != null)
+ return
validatingReader.ReadElementContentAsBase64 (buffer, offset, length);
+ else
+ return sourceReader.ReadElementContentAsBase64
(buffer, offset, length);
+ }
+
+ [MonoTODO ("Check how expanded entity is handled here.")]
+ public override int ReadElementContentAsBinHex (byte [] buffer,
int offset, int length)
+ {
+ if (validatingReader != null)
+ return
validatingReader.ReadElementContentAsBinHex (buffer, offset, length);
+ else
+ return sourceReader.ReadElementContentAsBinHex
(buffer, offset, length);
+ }
+#endif
#endregion // Methods
#region Events and Delegates
Modified: trunk/mcs/class/System.XML/System.Xml/XmlWriter.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlWriter.cs 2005-06-27 08:31:32 UTC
(rev 46536)
+++ trunk/mcs/class/System.XML/System.Xml/XmlWriter.cs 2005-06-27 08:33:39 UTC
(rev 46537)
@@ -106,6 +106,11 @@
return Create (writer, null);
}
+ public static XmlWriter Create (XmlWriter writer)
+ {
+ return Create (writer, null);
+ }
+
public static XmlWriter Create (StringBuilder builder)
{
return Create (builder, null);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
